diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2012-10-04 01:51:57 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2012-10-04 01:51:57 +0530 |
| commit | 52b25aaf20f512911a981958e0efa9365eb34489 (patch) | |
| tree | 6e30bd5dac83edde4cdbdd66b6c783039fba24da /phpBB | |
| parent | a2e1989b012e3f77a18c2758cd913245ce3c180b (diff) | |
| download | forums-52b25aaf20f512911a981958e0efa9365eb34489.tar forums-52b25aaf20f512911a981958e0efa9365eb34489.tar.gz forums-52b25aaf20f512911a981958e0efa9365eb34489.tar.bz2 forums-52b25aaf20f512911a981958e0efa9365eb34489.tar.xz forums-52b25aaf20f512911a981958e0efa9365eb34489.zip | |
[ticket/11051] add get_word_len() in sphinx search
get_word_len() for sphinx search backend returns false always and
triggers proper error.
PHPBB3-11051
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/search/fulltext_sphinx.php | 10 | ||||
| -rw-r--r-- | phpBB/search.php | 9 |
2 files changed, 18 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_sphinx.php b/phpBB/includes/search/fulltext_sphinx.php index 256c3a6d1c..a6cc47b836 100644 --- a/phpBB/includes/search/fulltext_sphinx.php +++ b/phpBB/includes/search/fulltext_sphinx.php @@ -109,6 +109,16 @@ class phpbb_search_fulltext_sphinx } /** + * Returns false as there is no word_len array + * + * @return false + */ + public function get_word_length() + { + return false; + } + + /** * Returns the common_words array * * @return array common words that are ignored by search backend diff --git a/phpBB/search.php b/phpBB/search.php index 54f0f225a0..e869c8eebd 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -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); + } } } |