diff options
| author | Ferenc Kovacs <tyrael@php.net> | 2014-07-25 13:16:31 +0200 |
|---|---|---|
| committer | Ferenc Kovacs <tyrael@php.net> | 2014-07-25 13:16:31 +0200 |
| commit | 03dcdf5742e56abe305809ea233ba41301fddc16 (patch) | |
| tree | b1e5bfefb9c96f95ee714e498e94610253f2e976 | |
| parent | 7abaac41fd07518a8c95f717c204ce13909fd8c9 (diff) | |
| parent | a68ef0a117b0e7da4fe9ab1ee098c6e5e0553c4a (diff) | |
| download | php-git-03dcdf5742e56abe305809ea233ba41301fddc16.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
Revert "Fix bug #66568: the second arg for unserialize is optional." as we already reverted the introduction of the second arg.
| -rw-r--r-- | ext/standard/basic_functions.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 5ca7ec0ffe..3c60308fe4 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2635,7 +2635,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() |