]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7abaac4 a68ef0a)
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Fri, 25 Jul 2014 11:16:31 +0000 (13:16 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 25 Jul 2014 11:16:31 +0000 (13:16 +0200)
* PHP-5.6:
  Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.

1  2 
ext/standard/basic_functions.c patch | diff1 | diff2 | blob | history

diff --cc ext/standard/basic_functions.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.