diff options
author | Christian Weber | 2012-02-29 13:50:21 +0000 |
---|---|---|
committer | Christian Weber | 2012-02-29 13:50:21 +0000 |
commit | dfa339276ba33417567d19a42214ecad50d68992 (patch) | |
tree | 0305dcbb75eccca497c6b2e116302d5fd34b2026 | |
parent | 5a3294d887f0a627e55c4502ee6e9413d13cc7d0 (diff) | |
download | itools-dfa339276ba33417567d19a42214ecad50d68992.tar.gz itools-dfa339276ba33417567d19a42214ecad50d68992.tar.bz2 itools-dfa339276ba33417567d19a42214ecad50d68992.zip |
bugfix: . matches umlaut in utf-8 mode
-rw-r--r-- | it.class | 2 | ||||
-rwxr-xr-x | tests/it.t | 5 |
2 files changed, 6 insertions, 1 deletions
@@ -341,7 +341,7 @@ static function convertregex($pattern, $p = null) static function match($pattern, $string, $p = null) { if (!preg_match('/\\\\[wb]|[!\x80-\xff]|\[\[:/i', $pattern) && !$p) - $r = preg_match('!' . $pattern . '!i', $string, $m); # fast path for simple patterns + $r = preg_match('!' . $pattern . '!i' . (ini_get('default_charset') == 'utf-8' ? 'u' : ''), $string, $m); # fast path for simple patterns else { $flags = $p['offset_capture'] ? PREG_OFFSET_CAPTURE : 0; @@ -207,6 +207,11 @@ match( utf8_encode('Müller'), '\w matches umlaut in utf-8 mode' ); +match( + 'M.ller', utf8_encode('Müller'), + utf8_encode('Müller'), + '. matches umlaut in utf-8 mode' +); ini_set('default_charset', $oldcharset); is( |