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

[ticket/11051] add get_word_len() in sphinx search

Browse source 
get_word_len() for sphinx search backend returns false always and
triggers proper error.

PHPBB3-11051
This commit is contained in:
Dhruv 2012-10-04 01:51:57 +05:30
parent a2e1989b01
commit 52b25aaf20
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/search/fulltext_sphinx.php
View file

@ -108,6 +108,16 @@ class phpbb_search_fulltext_sphinx
return $this->search_query;
}
/**
* Returns false as there is no word_len array
*
* @return false
*/
public function get_word_length()
{
return false;
}
/**
* Returns the common_words array
*

9
phpBB/search.php
View file

@ -296,7 +296,14 @@ if ($keywords || $author || $author_id || $search_id || $submit)
$ignored = (sizeof($search->get_common_words())) ? sprintf($user->lang['IGNORED_TERMS_EXPLAIN'], implode(' ', $search->get_common_words())) . '<br />' : '';
// Function cannot be directly used as associative array for php < 5.4
$word_length = $search->get_word_length();
trigger_error($ignored . $user->lang('NO_KEYWORDS', $user->lang('CHARACTERS', (int) $word_length['min']), $user->lang('CHARACTERS', (int) $word_length['max'])));
if ($word_length)
{
trigger_error($ignored . $user->lang('NO_KEYWORDS', $user->lang('CHARACTERS', (int) $word_length['min']), $user->lang('CHARACTERS', (int) $word_length['max'])));
}
else
{
trigger_error($ignored);
}
}
}