summaryrefslogtreecommitdiff
path: root/ext/standard/basic_functions.c
diff options
context:
space:
mode:
authorGeorge Wang <gwang@php.net>2014-09-03 11:28:30 -0400
committerGeorge Wang <gwang@php.net>2014-09-03 11:28:30 -0400
commitb16929ca7294fb047e63eb6c04d715d980a50c47 (patch)
treee8ccc6acd38dbf670380cccc500100279d74f53d /ext/standard/basic_functions.c
parentbba16dde5ded45802543712bb3b9fe6e93b10751 (diff)
parent9266227402f50e1ad9953952b68a5ff3a25806b0 (diff)
downloadphp-git-b16929ca7294fb047e63eb6c04d715d980a50c47.tar.gz
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Diffstat (limited to 'ext/standard/basic_functions.c')
-rw-r--r--ext/standard/basic_functions.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/standard/basic_functions.c b/ext/standard/basic_functions.c
index d23c050ac4..ace6540a04 100644
--- a/ext/standard/basic_functions.c
+++ b/ext/standard/basic_functions.c
@@ -2324,8 +2324,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)