diff options
| author | Ruslan Uzdenov <rxu@mail.ru> | 2009-07-07 12:59:30 +0000 |
|---|---|---|
| committer | Ruslan Uzdenov <rxu@mail.ru> | 2009-07-07 12:59:30 +0000 |
| commit | eb4eee77ac5b870966a00b4e23ff14f204e18c68 (patch) | |
| tree | 19e291279217d7855bc5849e7d603227c55decd3 /phpBB | |
| parent | 4991cae3a1f5d3bcb435ae65bd63d4a705aa0653 (diff) | |
| download | forums-eb4eee77ac5b870966a00b4e23ff14f204e18c68.tar forums-eb4eee77ac5b870966a00b4e23ff14f204e18c68.tar.gz forums-eb4eee77ac5b870966a00b4e23ff14f204e18c68.tar.bz2 forums-eb4eee77ac5b870966a00b4e23ff14f204e18c68.tar.xz forums-eb4eee77ac5b870966a00b4e23ff14f204e18c68.zip | |
Further word censor fix to work with UTF8 correctly
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9726 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/cache.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 630f35bc3c..13dd42cf8f 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -144,6 +144,7 @@ <li>[Fix] Fix minor issue with L_QUOTE language string missing in several PM composing modes. (Bug #39625 - Patch by rxu)</li> <li>[Fix] Color bbcode now supports three-digit hex notation. (Bug #39965 - Patch by m0rpha)</li> <li>[Fix] Search by authorname does not display posts of guests and deleted users (Bug #36565 - Patch by nickvergessen)</li> + <li>[Fix] Further word censor fix to work with UTF8 correctly. (Patch by rxu)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php index 392f1377da..1effada666 100644 --- a/phpBB/includes/cache.php +++ b/phpBB/includes/cache.php @@ -86,7 +86,7 @@ class cache extends acm { if ((version_compare(PHP_VERSION, '5.1.0', '>=') || (version_compare(PHP_VERSION, '5.0.0-dev', '<=') && version_compare(PHP_VERSION, '4.4.0', '>='))) && @preg_match('/\p{L}/u', 'a') !== false) { - $censors['match'][] = '#(?<!\p{L})(' . str_replace('\*', '\p{L}*?', preg_quote($row['word'], '#')) . ')(?!\p{L})#u'; + $censors['match'][] = '#(?<![\p{Nd}\p{L}_])(' . str_replace('\*', '[\p{Nd}\p{L}_]*?', preg_quote($row['word'], '#')) . ')(?![\p{Nd}\p{L}_])#u'; } else { |