MFB: Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly)

diff --git a/NEWS b/NEWS
index d37db7a86602bb420cccac6ab2d838b233d9bb99..5cad7d0b2e79e5143f2bbb21d66a327abe4ff384 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,8 @@ PHP                                                                        NEWS
 - Fixed memory leak inside readline_callback_handler_remove() function. (Felipe)
 - Fixed bug #46649 (Setting array element with that same array produces 
   inconsistent results). (Arnaud)
+- Fixed bug #46626 (mb_convert_case does not handle apostrophe correctly).
+  (Ilia)
 
 20 Nov 2008, PHP 5.2.7RC4
 - Added logging option for error_log to send directly to SAPI. (Stas)

diff --git a/ext/mbstring/php_unicode.c b/ext/mbstring/php_unicode.c
index d90cabb84d99c30dc163e573ee880c665f23f479..038044b1b92ca2ad431f5298402434647cc61582 100644 (file)
--- a/ext/mbstring/php_unicode.c
+++ b/ext/mbstring/php_unicode.c
@@ -308,7 +308,7 @@ MBSTRING_API char *php_unicode_convert_case(int case_mode, char *srcstr, size_t
                        for (i = 0; i < unicode_len; i+=4) {
                                int res = php_unicode_is_prop(
                                        BE_ARY_TO_UINT32(&unicode_ptr[i]),
-                                       UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT, 0);
+                                       UC_MN|UC_ME|UC_CF|UC_LM|UC_SK|UC_LU|UC_LL|UC_LT|UC_PO|UC_OS, 0);
                                if (mode) {
                                        if (res) {
                                                UINT32_TO_BE_ARY(&unicode_ptr[i],