aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Atkinson <thefinn@users.sourceforge.net>2002-02-03 18:34:36 +0000
committerJames Atkinson <thefinn@users.sourceforge.net>2002-02-03 18:34:36 +0000
commitd1fa772e4663e08d3a2483646f9adb3521e09cb1 (patch)
treefdc61fd901942175feaae35ff95ad5b992202c0b
parenta03881cf7f6cb80eac2ba1f55c5488e569a58996 (diff)
downloadforums-d1fa772e4663e08d3a2483646f9adb3521e09cb1.tar
forums-d1fa772e4663e08d3a2483646f9adb3521e09cb1.tar.gz
forums-d1fa772e4663e08d3a2483646f9adb3521e09cb1.tar.bz2
forums-d1fa772e4663e08d3a2483646f9adb3521e09cb1.tar.xz
forums-d1fa772e4663e08d3a2483646f9adb3521e09cb1.zip
Semi-fix for bug #511849 , see comments for more details
git-svn-id: file:///svn/phpbb/trunk@2046 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/viewtopic.php17
1 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 82a359c15c..5c117953dd 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -999,6 +999,15 @@ for($i = 0; $i < $total_posts; $i++)
//
//
+ // Highlight active words (primarily for search)
+ //
+ if( $highlight_active )
+ {
+ $message = preg_replace($highlight_match, $highlight_replace, $message);
+ }
+
+
+ //
// If the board has HTML off but the post has HTML
// on then we process it, else leave it alone
//
@@ -1038,14 +1047,6 @@ for($i = 0; $i < $total_posts; $i++)
$message = make_clickable($message);
//
- // Highlight active words (primarily for search)
- //
- if( $highlight_active )
- {
- $message = preg_replace($highlight_match, $highlight_replace, $message);
- }
-
- //
// Replace naughty words
//
if( count($orig_word) )