]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 14 Jan 2013 01:27:05 +0000 (17:27 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Jan 2013 01:27:05 +0000 (17:27 -0800)
* PHP-5.4:
  fix bug #63982: isset() inconsistently produces a fatal error on protected property
  different OSes have different messages, and that's not what the test is about anyway


Trivial merge