diff options
| author | Nils Adermann <naderman@naderman.de> | 2007-05-13 16:15:20 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2007-05-13 16:15:20 +0000 |
| commit | 4b876ffee5b714bcd7fbf8eb2df022f32251a9ff (patch) | |
| tree | 77a8557507f9fd919486683e2566db34a64fc2f2 /phpBB/viewtopic.php | |
| parent | b8daa787095eece45eeb3e1b6351efbed292bbd1 (diff) | |
| download | forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.gz forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.bz2 forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.tar.xz forums-4b876ffee5b714bcd7fbf8eb2df022f32251a9ff.zip | |
- correctly transfer the search query across search result pages
- changed highlighting so foo* will match foo again [Bug #10031]
- restructured magic urls (functionality still mostly the same), added a check for entities in urls and punctuation at the end of magic urls [Bugs #10639, #10293]
- undid the workaround for urls in quotes, as it's fixed by the new magic url handling
- allow magic urls enclosed in BBCode [Bug #10319]
- added handling for IPv6 addresses to the IP checking without adding extra options [Bug #9538]
- correctly handle search in search results of search queries with brackets [Bug #10581]
- added information about requirements for auth_apache [Bug #10107]
git-svn-id: file:///svn/phpbb/trunk@7559 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 6b5c2f411d..04505d07f0 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -407,7 +407,9 @@ if ($hilit_words) { if (trim($word)) { - $highlight_match .= (($highlight_match != '') ? '|' : '') . str_replace('\*', '\w+?', preg_quote($word, '#')); + $word = str_replace('\*', '\w+?', preg_quote($word, '#')); + $word = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $word); + $highlight_match .= (($highlight_match != '') ? '|' : '') . $word; } } |