mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-16 21:54:00 +02:00
Code Issues Releases 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
parent 9100f4ebbf c51dcbe6a0
commit 3b6d371310
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
phpBB/phpbb/search/fulltext_native.php
View File

@@ -325,7 +325,6 @@ class fulltext_native extends \phpbb\search\base
}
$this->db->sql_freeresult($result);
}
unset($exact_words);
// now analyse the search query, first split it using the spaces
$query = explode(' ', $keywords);
@@ -451,39 +450,21 @@ class fulltext_native extends \phpbb\search\base
$this->{$mode . '_ids'}[] = $words[$word];
}
}
// throw an error if we shall not ignore unexistant words
else if (!$ignore_no_id)
else
{
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
if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
{
$this->common_words[] = $word;
}
}
}
else
{
$len = utf8_strlen($word);
if ($len < $this->word_length['min'] || $len > $this->word_length['max'])
{
$this->common_words[] = $word;
}
}
}
// 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;
}
@@ -518,6 +499,12 @@ class fulltext_native extends \phpbb\search\base
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_not_contain_ids = $this->must_not_contain_ids;
$must_exclude_one_ids = $this->must_exclude_one_ids;