diff options
author | Tjerk Meesters <datibbaw@php.net> | 2014-07-12 11:10:15 +0800 |
---|---|---|
committer | Tjerk Meesters <datibbaw@php.net> | 2014-07-12 11:10:15 +0800 |
commit | 18feaf94166b2c80fe788971a6db74e2e95a9cfe (patch) | |
tree | 81ae5cbb9e0689932c71d74cc7f2799c7480c345 /ext/standard/basic_functions.c | |
parent | ca8c94c917cb46983da681eec2cf6b17d22c5d5f (diff) | |
parent | 377750cd8f9618498d05c0ac7a79b05a5c6794d4 (diff) | |
download | php-git-18feaf94166b2c80fe788971a6db74e2e95a9cfe.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r-- | ext/standard/basic_functions.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c index 69e20fdd9a..62ac0d1c6d 100644 --- a/ext/standard/basic_functions.c +++ b/ext/standard/basic_functions.c @@ -2296,8 +2296,9 @@ ZEND_BEGIN_ARG_INFO(arginfo_lcfirst, 0) ZEND_ARG_INFO(0, str) ZEND_END_ARG_INFO() -ZEND_BEGIN_ARG_INFO(arginfo_ucwords, 0) +ZEND_BEGIN_ARG_INFO_EX(arginfo_ucwords, 0, 0, 1) ZEND_ARG_INFO(0, str) + ZEND_ARG_INFO(0, delimiters) ZEND_END_ARG_INFO() ZEND_BEGIN_ARG_INFO_EX(arginfo_strtr, 0, 0, 2) |