mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-09 02:06:32 +02:00
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus: [ticket/10423] Replace foreach with function in viewtopic.php [ticket/10423] Remove unnecessary include in test [ticket/10423] Match multiple wildcards [ticket/10423] Move code into a function and add tests for it [ticket/10423] Remove * from search or highlight string
This commit is contained in:
@@ -422,17 +422,11 @@ else
|
||||
$highlight_match = $highlight = '';
|
||||
if ($hilit_words)
|
||||
{
|
||||
foreach (explode(' ', trim($hilit_words)) as $word)
|
||||
{
|
||||
if (trim($word))
|
||||
{
|
||||
$word = str_replace('\*', '\w+?', preg_quote($word, '#'));
|
||||
$word = preg_replace('#(^|\s)\\\\w\*\?(\s|$)#', '$1\w+?$2', $word);
|
||||
$highlight_match .= (($highlight_match != '') ? '|' : '') . $word;
|
||||
}
|
||||
}
|
||||
|
||||
$highlight = urlencode($hilit_words);
|
||||
$highlight_match = phpbb_clean_search_string($hilit_words);
|
||||
$highlight = urlencode($highlight_match);
|
||||
$highlight_match = str_replace('\*', '\w+?', preg_quote($highlight_match, '#'));
|
||||
$highlight_match = preg_replace('#(?<=^|\s)\\\\w\*\?(?=\s|$)#', '\w+?', $highlight_match);
|
||||
$highlight_match = str_replace(' ', '|', $highlight_match);
|
||||
}
|
||||
|
||||
// Make sure $start is set to the last page if it exceeds the amount
|
||||
|
Reference in New Issue
Block a user