MFH: Fixed bug #30356 (str_ireplace() does not work on all strings).

diff --git a/NEWS b/NEWS
index cbd1fbdb3d8d7d0928f28bc0cb3b1d28c012f5eb..419f83180db3f49cc475f42a914583498ccb0e44 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2004, PHP 5.0.3
 - Fixed potential problems with unserializing invalid serialize data. (Marcus)
+- Fixed bug #30356 (str_ireplace() does not work on all strings). (Ilia)
 - Fixed bug #30344 (Reflection::getModifierNames() returns too long strings).
   (Marcus)
 - Fixed bug #30282 (segfault when using unknown/unsupported 

diff --git a/ext/standard/string.c b/ext/standard/string.c
index 4ee93264fbdd520f9ab3cc62e2b6c3b02b2a1f34..79a0eeab0d51c66ede2319ee80be28d5cdc50eab 100644 (file)
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2938,7 +2938,7 @@ PHPAPI int php_char_to_str_ex(char *str, uint len, char from, char *to, int to_l
                }
        }
 
-       if (char_count == 0) {
+       if (char_count == 0 && case_sensitivity) {
                ZVAL_STRINGL(result, str, len, 1);
                return 0;
        }