summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-07-07 15:49:16 +0200
committerFerenc Kovacs <tyrael@php.net>2015-07-07 15:49:16 +0200
commitb6f5cb11a4482e678bb4fb0a09f1e2fb6ec4190f (patch)
tree24ea50e50d496f97d50a7d73d57e327bc7c15b86
parent8f2e08239fc1f8aabc26398393303fa685e810dd (diff)
parent29533ae528af6ddf2ea93228721e75c6b94370fc (diff)
downloadphp-git-b6f5cb11a4482e678bb4fb0a09f1e2fb6ec4190f.tar.gz
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4: add missing second argument for ucfirst to the proto
-rw-r--r--ext/standard/string.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c
index 8c850512c7..63eede1c71 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2749,7 +2749,7 @@ PHP_FUNCTION(lcfirst)
}
/* }}} */
-/* {{{ proto string ucwords(string str)
+/* {{{ proto string ucwords(string str [, string delims])
Uppercase the first character of every word in a string */
PHP_FUNCTION(ucwords)
{