diff options
| author | rxu <rxu@mail.ru> | 2011-01-05 21:13:33 +0700 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-01-07 15:32:34 +0100 |
| commit | 951b7b22e002571f1c304fcd63049aae77551a7b (patch) | |
| tree | c50478fa8747c476705a211298a6cb05d9b1e198 /phpBB/includes/cache.php | |
| parent | 9a25e4ad8956f46fa41a6057a8af53f2955fb532 (diff) | |
| download | forums-951b7b22e002571f1c304fcd63049aae77551a7b.tar forums-951b7b22e002571f1c304fcd63049aae77551a7b.tar.gz forums-951b7b22e002571f1c304fcd63049aae77551a7b.tar.bz2 forums-951b7b22e002571f1c304fcd63049aae77551a7b.tar.xz forums-951b7b22e002571f1c304fcd63049aae77551a7b.zip | |
[ticket/9933] Move word censor regex into separate function in functions.php
PHPBB3-9933
Diffstat (limited to 'phpBB/includes/cache.php')
| -rw-r--r-- | phpBB/includes/cache.php | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php index 9b90483b50..612adcca4f 100644 --- a/phpBB/includes/cache.php +++ b/phpBB/includes/cache.php @@ -82,26 +82,9 @@ class cache extends acm $result = $db->sql_query($sql); $censors = array(); - $unicode = ((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) ? true : false; - while ($row = $db->sql_fetchrow($result)) { - if ($unicode) - { - // Unescape the asterisk to simplify further conversions - $row['word'] = str_replace('\*', '*', preg_quote($row['word'], '#')); - - // Replace the asterisk inside the pattern, at the start and at the end of it with regexes - $row['word'] = preg_replace(array('#(?<=[\p{Nd}\p{L}_])\*+(?=[\p{Nd}\p{L}_])#iu', '#^\*+#', '#\*+$#'), array('([\x20]*?|[\p{Nd}\p{L}_-]*?)', '[\p{Nd}\p{L}_-]*?', '[\p{Nd}\p{L}_-]*?'), $row['word']); - - // Generate the final substitution - $censors['match'][] = '#(?<![\p{Nd}\p{L}_-])(' . $row['word'] . ')(?![\p{Nd}\p{L}_-])#iu'; - } - else - { - $censors['match'][] = '#(?<!\S)(' . str_replace('\*', '\S*?', preg_quote($row['word'], '#')) . ')(?!\S)#iu'; - } - + $censors['match'][] = get_censor_preg_expression($row['word']); $censors['replace'][] = $row['replacement']; } $db->sql_freeresult($result); |