fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
Merge branch 'PHP-5.5'

* PHP-5.5:
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt