From: Ferenc Kovacs Date: Fri, 25 Jul 2014 11:15:27 +0000 (+0200) Subject: Revert "Fix bug #66568: the second arg for unserialize is optional." as we already... X-Git-Tag: PRE_PHPNG_MERGE~55^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a68ef0a117b0e7da4fe9ab1ee098c6e5e0553c4a;p=php Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg. This reverts commit aefc8f22b35999624f3a579696cf68b389f41ae8. Conflicts: NEWS --- diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 62ac0d1c6d..fed2a4f0fb 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -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()