diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 18:55:56 +0100 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2012-11-29 18:55:56 +0100 |
| commit | aaacfae428a354b76a7197452ed94aa77b128ea5 (patch) | |
| tree | 56853eaf0497e71fdd13bf9ee1b2ccf810973c4d /phpBB/includes | |
| parent | b453f359ff6dab58b0eaf94548c4e58110fb02ec (diff) | |
| parent | 79237b60b6b234e10f14cbcb00691b5e4374fd04 (diff) | |
| download | forums-aaacfae428a354b76a7197452ed94aa77b128ea5.tar forums-aaacfae428a354b76a7197452ed94aa77b128ea5.tar.gz forums-aaacfae428a354b76a7197452ed94aa77b128ea5.tar.bz2 forums-aaacfae428a354b76a7197452ed94aa77b128ea5.tar.xz forums-aaacfae428a354b76a7197452ed94aa77b128ea5.zip | |
Merge remote-tracking branch 'p/ticket/11174' into develop
* p/ticket/11174:
[ticket/11174] Global $cache is a cache service instance.
[ticket/11174] Delete more copy pasting.
[ticket/11174] Drop needless teardown functions.
[ticket/11174] These tests do not need posts fixtures.
[ticket/11174] Empty fixture for when we don't need any data.
[ticket/11174] Eliminate search wrapper copy pasting.
[ticket/11174] Extract phpbb_search_test_case.
[ticket/11174] Delete copy pasting.
[ticket/11174] Move assertion definition to base class.
[ticket/11174] add unit tests for postgres search backend
[ticket/11174] include utf_tools in postgres search backend
[ticket/11174] negation queries do not return false
[ticket/11174] set config values
[ticket/11174] add test case for native test
[ticket/11174] rename native wrapper class
[ticket/11174] add mysql unit tests
[ticket/11174] removes unnecessary space from word
[ticket/11174] include utf_tools in mysql backend
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/search/fulltext_mysql.php | 10 | ||||
| -rw-r--r-- | phpBB/includes/search/fulltext_postgres.php | 8 |
2 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/includes/search/fulltext_mysql.php b/phpBB/includes/search/fulltext_mysql.php index 58a4dd7d6a..ff2e24aa05 100644 --- a/phpBB/includes/search/fulltext_mysql.php +++ b/phpBB/includes/search/fulltext_mysql.php @@ -86,6 +86,14 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base $this->word_length = array('min' => $this->config['fulltext_mysql_min_word_len'], 'max' => $this->config['fulltext_mysql_max_word_len']); + /** + * Load the UTF tools + */ + if (!function_exists('utf8_strlen')) + { + include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); + } + $error = false; } @@ -230,7 +238,7 @@ class phpbb_search_fulltext_mysql extends phpbb_search_base } else { - $tmp_split_words[] = $word . ' '; + $tmp_split_words[] = $word; } } if ($phrase) diff --git a/phpBB/includes/search/fulltext_postgres.php b/phpBB/includes/search/fulltext_postgres.php index 08f64735b6..2880610655 100644 --- a/phpBB/includes/search/fulltext_postgres.php +++ b/phpBB/includes/search/fulltext_postgres.php @@ -121,6 +121,14 @@ class phpbb_search_fulltext_postgres extends phpbb_search_base } } + /** + * Load the UTF tools + */ + if (!function_exists('utf8_strlen')) + { + include($phpbb_root_path . 'includes/utf/utf_tools.' . $phpEx); + } + $error = false; } |