com php-src: unserialize() takes a 2nd optional arg and it can't be a bool: ext/standard/basic_functions.c ext/standard/var.c
| From: | Rasmus Lerdorf | Date: | Wed, 15 Jul 2015 16:59:31 +0000 |
| Subject: | com php-src: unserialize() takes a 2nd optional arg and it can't be a bool: ext/standard/basic_functions.c ext/standard/var.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-87996@lists.php.net to get a copy of this message | ||
Commit: 73773c2175c88a3171236fc0ffce85b0efcd65fa
Author: Rasmus Lerdorf <rasmus@php.net> Wed, 15 Jul 2015 09:59:31 -0700
Parents: d0bea17d2ed97d889f919e92b93f922b4dff8e9e
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=73773c2175c88a3171236fc0ffce85b0efcd65fa
Log:
unserialize() takes a 2nd optional arg and it can't be a bool
Changed paths:
M ext/standard/basic_functions.c
M ext/standard/var.c
Diff:
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index 1d5e1dd..488b71b 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2653,8 +2653,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_serialize, 0)
ZEND_ARG_INFO(0, var)
ZEND_END_ARG_INFO()
-ZEND_BEGIN_ARG_INFO(arginfo_unserialize, 0)
+ZEND_BEGIN_ARG_INFO_EX(arginfo_unserialize, 0, 0, 1)
ZEND_ARG_INFO(0, variable_representation)
+ ZEND_ARG_INFO(0, allowed_classes)
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_memory_get_usage, 0, 0, 0)
diff --git a/ext/standard/var.c b/ext/standard/var.c
index 0551103..b1f368f 100644
--- a/ext/standard/var.c
+++ b/ext/standard/var.c
@@ -994,7 +994,7 @@ PHP_FUNCTION(serialize)
}
/* }}} */
-/* {{{ proto mixed unserialize(string variable_representation[, bool|array allowed_classes])
+/* {{{ proto mixed unserialize(string variable_representation[, array allowed_classes])
Takes a string representation of variable and recreates it */
PHP_FUNCTION(unserialize)
{