diff options
author | Ferenc Kovacs <tyrael@php.net> | 2015-07-07 15:49:44 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2015-07-07 15:49:44 +0200 |
commit | bdb9c0da86780b803bc85d3c721d14fbfa5316bb (patch) | |
tree | aa96822ad96ec95ec748920a389ff40c0ec2ed68 /ext/standard/string.c | |
parent | 26471eb69c3cd9e8162ff3b398d33919d9075191 (diff) | |
parent | b6f5cb11a4482e678bb4fb0a09f1e2fb6ec4190f (diff) | |
download | php-git-bdb9c0da86780b803bc85d3c721d14fbfa5316bb.tar.gz |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
add missing second argument for ucfirst to the proto
Diffstat (limited to 'ext/standard/string.c')
-rw-r--r-- | ext/standard/string.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/standard/string.c b/ext/standard/string.c index 497cae4042..8a960a8ed4 100644 --- a/ext/standard/string.c +++ b/ext/standard/string.c @@ -2744,7 +2744,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) { |