aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorPaul S. Owen <psotfx@users.sourceforge.net>2001-12-03 12:46:32 +0000
committerPaul S. Owen <psotfx@users.sourceforge.net>2001-12-03 12:46:32 +0000
commit4725c6dbea98fa6f3d0b74192c7c3733c3dda80e (patch)
tree93900ffa5eb5841043fa2490334835cbf261eb9f /phpBB/includes/functions.php
parent9cdb8981062733722a379b7691dd804fbf6308f2 (diff)
downloadforums-4725c6dbea98fa6f3d0b74192c7c3733c3dda80e.tar
forums-4725c6dbea98fa6f3d0b74192c7c3733c3dda80e.tar.gz
forums-4725c6dbea98fa6f3d0b74192c7c3733c3dda80e.tar.bz2
forums-4725c6dbea98fa6f3d0b74192c7c3733c3dda80e.tar.xz
forums-4725c6dbea98fa6f3d0b74192c7c3733c3dda80e.zip
Should fix bug #487886 bad word preg now uses # and quotes # too
git-svn-id: file:///svn/phpbb/trunk@1504 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index b1c1f0b95f..897941ee89 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -879,9 +879,9 @@ function obtain_word_list(&$orig_word, &$replacement_word)
for($i = 0; $i < count($word_list); $i++)
{
- $word = str_replace("\*", "\w*?", preg_quote($word_list[$i]['word']));
+ $word = str_replace("\*", "\w*?", preg_quote($word_list[$i]['word'], "#"));
- $orig_word[] = "/\b(" . $word . ")\b/i";
+ $orig_word[] = "#\b(" . $word . ")\b#i";
$replacement_word[] = $word_list[$i]['replacement'];
}
}