From 49e8de0ca281cc2f73040157b5957f5d9ade18a7 Mon Sep 17 00:00:00 2001 From: Nils Adermann Date: Mon, 27 Nov 2006 20:31:06 +0000 Subject: [PATCH] - Throw error on incorrect search queries [Bug #5648] git-svn-id: file:///svn/phpbb/trunk@6675 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/search.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpBB/search.php b/phpBB/search.php index f504f2079a..1be3aa8b14 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -231,8 +231,8 @@ if ($keywords || $author || $author_id || $search_id || $submit) // let the search module split up the keywords if ($keywords) { - $search->split_keywords($keywords, $search_terms); - if (empty($search->search_query) && !sizeof($author_id_ary) && !$search_id) + $correct_query = $search->split_keywords($keywords, $search_terms); + if (!$correct_query || (empty($search->search_query) && !sizeof($author_id_ary) && !$search_id)) { $ignored = (sizeof($search->common_words)) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], htmlspecialchars(implode(' ', $search->common_words), ENT_COMPAT, 'UTF-8')) . '
' : ''; trigger_error($ignored . sprintf($user->lang['NO_KEYWORDS'], $search->word_length['min'], $search->word_length['max']));