summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFerenc Kovacs <tyrael@php.net>2015-07-07 15:50:02 +0200
committerFerenc Kovacs <tyrael@php.net>2015-07-07 15:50:02 +0200
commitdf499b91086b5aab2deeb6884fc063eef307ed73 (patch)
tree7e9fc5a5fecd11f406b9bb66a0320b11cd784673
parent015d20ab8398bb337cfddd2e0ec6a81cd270d82f (diff)
parentbdb9c0da86780b803bc85d3c721d14fbfa5316bb (diff)
downloadphp-git-df499b91086b5aab2deeb6884fc063eef307ed73.tar.gz
Merge branch 'PHP-5.6'
* PHP-5.6: 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 3832b31b46..4d5c72404f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2835,7 +2835,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)
{