From 4d2ed4ef0bd24c3f2f8810ea899dd06bac4420e6 Mon Sep 17 00:00:00 2001 From: TAKAGI Masahiro Date: Wed, 30 Jan 2013 21:03:39 +0000 Subject: [PATCH] mbstring: Fix prototypes mb_convert_case(): 2nd parameter is not optional so default value is meaningless. mb_decode_numericentity(): 3rd parameter is optional and its default value is internal encoding. mb_encode_numericentity(): 3rd parameter is optional and its default value is internal encoding. added 4th parameter as of PHP 5.4.0. mb_regex_set_options(): no default value of "options" git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@329377 c90b9560-bf6c-de11-be94-00142212c4b1 --- .../mbstring/functions/mb-convert-case.xml | 2 +- .../functions/mb-decode-numericentity.xml | 2 +- .../functions/mb-encode-numericentity.xml | 34 ++++++++++++++++++- .../functions/mb-regex-set-options.xml | 2 +- 4 files changed, 36 insertions(+), 4 deletions(-) diff --git a/reference/mbstring/functions/mb-convert-case.xml b/reference/mbstring/functions/mb-convert-case.xml index 63e85f8a0a..9ce2d077cd 100644 --- a/reference/mbstring/functions/mb-convert-case.xml +++ b/reference/mbstring/functions/mb-convert-case.xml @@ -11,7 +11,7 @@ stringmb_convert_case stringstr - intmodeMB_CASE_UPPER + intmode stringencodingmb_internal_encoding() diff --git a/reference/mbstring/functions/mb-decode-numericentity.xml b/reference/mbstring/functions/mb-decode-numericentity.xml index 73e3f70dd7..e45247f09f 100644 --- a/reference/mbstring/functions/mb-decode-numericentity.xml +++ b/reference/mbstring/functions/mb-decode-numericentity.xml @@ -12,7 +12,7 @@ stringmb_decode_numericentity stringstr arrayconvmap - stringencoding + stringencodingmb_internal_encoding() Convert numeric string reference of string diff --git a/reference/mbstring/functions/mb-encode-numericentity.xml b/reference/mbstring/functions/mb-encode-numericentity.xml index 812d3a33fd..8467d12b3d 100644 --- a/reference/mbstring/functions/mb-encode-numericentity.xml +++ b/reference/mbstring/functions/mb-encode-numericentity.xml @@ -12,7 +12,8 @@ stringmb_encode_numericentity stringstr arrayconvmap - stringencoding + stringencodingmb_internal_encoding() + boolis_hex Converts @@ -48,6 +49,13 @@ &mbstring.encoding.parameter; + + is_hex + + + + + @@ -59,6 +67,30 @@ + + &reftitle.changelog; + + + + + + &Version; + &Description; + + + + + 5.4.0 + + Added is_hex parameter. + + + + + + + + &reftitle.examples; diff --git a/reference/mbstring/functions/mb-regex-set-options.xml b/reference/mbstring/functions/mb-regex-set-options.xml index 2c6ebcc1fd..62bf53fcd6 100644 --- a/reference/mbstring/functions/mb-regex-set-options.xml +++ b/reference/mbstring/functions/mb-regex-set-options.xml @@ -10,7 +10,7 @@ &reftitle.description; stringmb_regex_set_options - stringoptions"msr" + stringoptions Sets the default options described by options