diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2011-08-21 15:21:25 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2011-08-21 15:21:25 +0200 |
| commit | 4bc09cd34db4b103693c2188c79067c10b7e0b15 (patch) | |
| tree | de1a34d35f711400cf6b05705611ba8d8df9d2cf /phpBB/includes/functions.php | |
| parent | 8ad58645fe87a77cbc79f25ef2aff7a3785d24eb (diff) | |
| parent | ac11806bf449b1ca1b69eae023b5ec318a10547d (diff) | |
| download | forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.gz forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.bz2 forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.tar.xz forums-4bc09cd34db4b103693c2188c79067c10b7e0b15.zip | |
Merge remote-tracking branch 'bantu/ticket/10329' into develop
* bantu/ticket/10329:
[ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index b0c89bdceb..a118af0396 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3285,7 +3285,7 @@ function get_censor_preg_expression($word, $use_unicode = true) // Unescape the asterisk to simplify further conversions $word = str_replace('\*', '*', preg_quote($word, '#')); - if ($use_unicode && pcre_utf8_support()) + if ($use_unicode && phpbb_pcre_utf8_support()) { // Replace asterisk(s) inside the pattern, at the start and at the end of it with regexes $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}_-]*?'), $word); @@ -4742,7 +4742,7 @@ function phpbb_user_session_handler() * * @return bool Returns true if PCRE (the regular expressions library) supports UTF-8 encoding */ -function pcre_utf8_support() +function phpbb_pcre_utf8_support() { static $utf8_pcre_properties = null; if (is_null($utf8_pcre_properties)) |