makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/10945' into ticket/10945-develop

Browse source 
* 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

Conflicts:
	phpBB/phpbb/search/fulltext_native.php
This commit is contained in:
Dhruv 2014-03-08 21:44:30 +05:30
commit 3b6d371310
2 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
phpBB/phpbb/search/fulltext_native.php
View file

@ -325,7 +325,6 @@ class fulltext_native extends \phpbb\search\base
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
} }
unset($exact_words);
// now analyse the search query, first split it using the spaces // now analyse the search query, first split it using the spaces
$query = explode(' ', $keywords); $query = explode(' ', $keywords);
@ -451,23 +450,9 @@ class fulltext_native extends \phpbb\search\base
$this->{$mode . '_ids'}[] = $words[$word]; $this->{$mode . '_ids'}[] = $words[$word];
} }
} }
// throw an error if we shall not ignore unexistant words else
else if (!$ignore_no_id)
{ {
if (!isset($common_ids[$word])) if (!isset($common_ids[$word]))
{
$len = utf8_strlen($word);
if ($len >= $this->word_length['min'] && $len <= $this->word_length['max'])
{
trigger_error(sprintf($this->user->lang['WORD_IN_NO_POST'], $word));
}
else
{
$this->common_words[] = $word;
}
}
}
else
{ {
$len = utf8_strlen($word); $len = utf8_strlen($word);
if ($len < $this->word_length['min'] || $len > $this->word_length['max']) if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
@ -476,14 +461,10 @@ class fulltext_native extends \phpbb\search\base
} }
} }
} }
// we can't search for negatives only
if (!sizeof($this->must_contain_ids))
{
return false;
} }
if (!empty($this->search_query)) // Return true if all words are not common words
if (sizeof($exact_words) - sizeof($this->common_words) > 0)
{ {
return true; return true;
} }
@ -518,6 +499,12 @@ class fulltext_native extends \phpbb\search\base
return false; return false;
} }
// we can't search for negatives only
if (empty($this->must_contain_ids))
{
return false;
}
$must_contain_ids = $this->must_contain_ids; $must_contain_ids = $this->must_contain_ids;
$must_not_contain_ids = $this->must_not_contain_ids; $must_not_contain_ids = $this->must_not_contain_ids;
$must_exclude_one_ids = $this->must_exclude_one_ids; $must_exclude_one_ids = $this->must_exclude_one_ids;

6
phpBB/search.php
View file

@ -527,12 +527,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_posts_fid_sql, $topic_id, $author_id_ary, $sql_author_match, $id_ary, $start, $per_page); $total_match_count = $search->author_search($show_results, $firstpost_only, $sort_by_sql, $sort_key, $sort_dir, $sort_days, $ex_fid_ary, $m_approve_posts_fid_sql, $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 = ''; $sql_where = '';
if (sizeof($id_ary)) if (sizeof($id_ary))