mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
#29435 (do not highlight if only wildcard(s) provided)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8669 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
56aba11fd1
commit
f47de03954
1 changed files with 15 additions and 12 deletions
|
@ -466,6 +466,9 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||||
|
|
||||||
// define some vars for urls
|
// define some vars for urls
|
||||||
$hilit = implode('|', explode(' ', preg_replace('#\s+#u', ' ', str_replace(array('+', '-', '|', '(', ')', '"'), ' ', $keywords))));
|
$hilit = implode('|', explode(' ', preg_replace('#\s+#u', ' ', str_replace(array('+', '-', '|', '(', ')', '"'), ' ', $keywords))));
|
||||||
|
// Do not allow *only* wildcard being used for hilight
|
||||||
|
$hilit = (strspn($hilit, '*') === strlen($hilit)) ? '' : $hilit;
|
||||||
|
|
||||||
$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
|
$u_hilit = urlencode(htmlspecialchars_decode(str_replace('|', ' ', $hilit)));
|
||||||
$u_show_results = ($show_results != 'posts') ? '&sr=' . $show_results : '';
|
$u_show_results = ($show_results != 'posts') ? '&sr=' . $show_results : '';
|
||||||
$u_search_forum = implode('&fid%5B%5D=', $search_forum);
|
$u_search_forum = implode('&fid%5B%5D=', $search_forum);
|
||||||
|
|
Loading…
Add table
Reference in a new issue