]> granicus.if.org Git - php/commitdiff
Revert "Fix bug #66568: the second arg for unserialize is optional." as we already...
authorFerenc Kovacs <tyrael@php.net>
Fri, 25 Jul 2014 11:15:27 +0000 (13:15 +0200)
committerFerenc Kovacs <tyrael@php.net>
Fri, 25 Jul 2014 11:15:27 +0000 (13:15 +0200)
This reverts commit aefc8f22b35999624f3a579696cf68b389f41ae8.

Conflicts:
NEWS

ext/standard/basic_functions.c

index 62ac0d1c6d741444d0eed5f230487a8278c7faf6..fed2a4f0fb54413b1f805e8f057b23e6835b9479 100644 (file)
@@ -2647,7 +2647,7 @@ ZEND_BEGIN_ARG_INFO(arginfo_serialize, 0)
        ZEND_ARG_INFO(0, var)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_unserialize, 0, 0, 1)
+ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0)
        ZEND_ARG_INFO(0, variable_representation)
 ZEND_END_ARG_INFO()