diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-11-27 20:31:06 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-11-27 20:31:06 +0000 |
| commit | 49e8de0ca281cc2f73040157b5957f5d9ade18a7 (patch) | |
| tree | dafed42634d9d1dca55cae474fdb1d7cd5223f43 /phpBB/search.php | |
| parent | 1f118ba2ae02dd1bf3ff1d3be06245b03a561180 (diff) | |
| download | forums-49e8de0ca281cc2f73040157b5957f5d9ade18a7.tar forums-49e8de0ca281cc2f73040157b5957f5d9ade18a7.tar.gz forums-49e8de0ca281cc2f73040157b5957f5d9ade18a7.tar.bz2 forums-49e8de0ca281cc2f73040157b5957f5d9ade18a7.tar.xz forums-49e8de0ca281cc2f73040157b5957f5d9ade18a7.zip | |
- Throw error on incorrect search queries [Bug #5648]
git-svn-id: file:///svn/phpbb/trunk@6675 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 4 |
1 files 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')) . '<br />' : ''; trigger_error($ignored . sprintf($user->lang['NO_KEYWORDS'], $search->word_length['min'], $search->word_length['max'])); |