diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-09 11:15:10 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2014-03-09 11:15:10 -0500 |
| commit | 00f8fe24d2641823f51990b30d5a3f84884a78a6 (patch) | |
| tree | a9b559f8ee4216cfa961fb2d760271f4d90b0e24 /phpBB/search.php | |
| parent | 9f4908f0f2896d60c348f4e52ef4a200a8404bd7 (diff) | |
| parent | c51dcbe6a0cd6e15456ac80b2bdfe13d94f27f07 (diff) | |
| download | forums-00f8fe24d2641823f51990b30d5a3f84884a78a6.tar forums-00f8fe24d2641823f51990b30d5a3f84884a78a6.tar.gz forums-00f8fe24d2641823f51990b30d5a3f84884a78a6.tar.bz2 forums-00f8fe24d2641823f51990b30d5a3f84884a78a6.tar.xz forums-00f8fe24d2641823f51990b30d5a3f84884a78a6.zip | |
Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10945' into develop-olympus
* remotes/dhruvgoel92/ticket/10945:
[ticket/10945] Fix return values for split_keywords function
[ticket/10945] Display search query when search fails in native search
[ticket/10945] remove trigger_error call
Diffstat (limited to 'phpBB/search.php')
| -rw-r--r-- | phpBB/search.php | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/phpBB/search.php b/phpBB/search.php index ad9c371f63..0f13dbbfa0 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -540,12 +540,6 @@ if ($keywords || $author || $author_id || $search_id || $submit) $total_match_count = $search->author_search($show_results, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_fid_ary, $topic_id, $author_id_ary, $sql_author_match, $id_ary, $start, $per_page); } - // For some searches we need to print out the "no results" page directly to allow re-sorting/refining the search options. - if (!sizeof($id_ary) && !$search_id) - { - trigger_error('NO_SEARCH_RESULTS'); - } - $sql_where = ''; if (sizeof($id_ary)) |