com php-src: Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.:
ext/standard/basic_functions.c
| From: | Ferenc Kovacs | Date: | Fri, 25 Jul 2014 11:15:27 +0000 |
| Subject: | com php-src: Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.: ext/standard/basic_functions.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-79590@lists.php.net to get a copy of this message | ||
Commit: a68ef0a117b0e7da4fe9ab1ee098c6e5e0553c4a
Author: Ferenc Kovacs <tyrael@php.net> Fri, 25 Jul 2014 13:15:27 +0200
Parents: 3345722354196b51a8518254f54938b627141384
Branches: PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a68ef0a117b0e7da4fe9ab1ee098c6e5e0553c4a
Log:
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
Bugs:
https://bugs.php.net/66568
Changed paths:
M ext/standard/basic_functions.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 62ac0d1..fed2a4f 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()