diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-11-04 13:37:22 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-11-04 13:37:22 +0000 |
| commit | 1544f456211bfdafd09cb873847d99b94002b5c5 (patch) | |
| tree | 3e6a45a75a2b1885174ec0f5929c4d86c0ac925b | |
| parent | 8b0ec6e02d5a53ea3d1b87abd122d39cc3e8366f (diff) | |
| download | forums-1544f456211bfdafd09cb873847d99b94002b5c5.tar forums-1544f456211bfdafd09cb873847d99b94002b5c5.tar.gz forums-1544f456211bfdafd09cb873847d99b94002b5c5.tar.bz2 forums-1544f456211bfdafd09cb873847d99b94002b5c5.tar.xz forums-1544f456211bfdafd09cb873847d99b94002b5c5.zip | |
trimmed the highlight regex
git-svn-id: file:///svn/phpbb/trunk@6550 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/search.php | 2 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index 5418f34c6b..b16a92384e 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -825,7 +825,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) if ($hilit) { // post highlighting - $message = preg_replace('#(?!(?:<(?:s(?:cript|tyle))?)[^<]*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $message); + $message = preg_replace('#(?!<.*)(?<!\w)(' . $hilit . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">$1</span>', $message); } $tpl_ary = array( diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 4275938548..0bcaea8489 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -1299,7 +1299,7 @@ for ($i = 0, $end = sizeof($post_list); $i < $end; ++$i) // Highlight active words (primarily for search) if ($highlight_match) { - $message = preg_replace('#(?!(?:<(?:s(?:cript|tyle))?)[^<]*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $message); + $message = preg_replace('#(?!<.*)(?<!\w)(' . $highlight_match . ')(?!\w|[^<>]*(?:</s(?:cript|tyle))?>)#is', '<span class="posthilit">\1</span>', $message); } // Replace naughty words such as farty pants |