diff options
-rw-r--r-- | it.class | 15 | ||||
-rwxr-xr-x | tests/it.t | 4 |
2 files changed, 14 insertions, 5 deletions
@@ -397,12 +397,17 @@ static function replace($replacements, $string, $p = array()) $patterns = array(); foreach (array_keys($replacements) as $pattern) - $patterns[] = it::convertregex($pattern, $p); + $patterns[] = !preg_match('/\\\\[wb]|[!\x80-\xff]|\[\[:/i', $pattern) && !$p ? "!$pattern!i" : it::convertregex($complex = $pattern, $p); - $oldlocale = setlocale(LC_CTYPE, 0); - setlocale(LC_CTYPE, 'de_CH'); - $result = preg_replace($patterns, array_values($replacements), $string, isset($p['limit']) ? $p['limit'] : -1); - setlocale(LC_CTYPE, $oldlocale); + if (!$complex) + $result = preg_replace($patterns, array_values($replacements), $string); + else + { + $oldlocale = setlocale(LC_CTYPE, 0); + setlocale(LC_CTYPE, 'de_CH'); + $result = preg_replace($patterns, array_values($replacements), $string, isset($p['limit']) ? $p['limit'] : -1); + setlocale(LC_CTYPE, $oldlocale); + } return $result; } @@ -210,6 +210,10 @@ is( "test all=>1,pattern_order=>1" ); +is(it::replace(array('\w' => "x"), "oö"), "xx"); +is(it::replace(array('\w' => "x", '#' => "!"), "#ö"), "!x"); +is(it::replace(array('#' => "!", '\w' => "x"), "#ö"), "!x"); +is(it::replace(array('ö' => "x"), "Ö"), "x"); # it::filter_keys tests |