aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/cache.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
commitb68de2323d6444b4b3685a98bbcb9500a38e45cb (patch)
tree6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/includes/cache.php
parent51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff)
downloadforums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/cache.php')
-rw-r--r--phpBB/includes/cache.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/cache.php b/phpBB/includes/cache.php
index 1effada666..a0142292ed 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{Nd}\p{L}_])(' . str_replace('\*', '[\p{Nd}\p{L}_]*?', preg_quote($row['word'], '#')) . ')(?![\p{Nd}\p{L}_])#u';
+ $censors['match'][] = '#(?<![\p{Nd}\p{L}_])(' . str_replace('\*', '[\p{Nd}\p{L}_]*?', preg_quote($row['word'], '#')) . ')(?![\p{Nd}\p{L}_])#iu';
}
else
{