diff options
| author | Nils Adermann <naderman@naderman.de> | 2012-11-09 12:12:33 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2012-11-09 12:12:33 +0100 |
| commit | 0282fe7024f4cb001d635ebebd98dfdf9af747e8 (patch) | |
| tree | d55be21eada1f13087d44ec0947332af57bbf501 /phpBB | |
| parent | 128eae72171838f689bb1bddba15e0e486325abc (diff) | |
| parent | a5f7f99478a43206ab6021a80828dddf66f92e9f (diff) | |
| download | forums-0282fe7024f4cb001d635ebebd98dfdf9af747e8.tar forums-0282fe7024f4cb001d635ebebd98dfdf9af747e8.tar.gz forums-0282fe7024f4cb001d635ebebd98dfdf9af747e8.tar.bz2 forums-0282fe7024f4cb001d635ebebd98dfdf9af747e8.tar.xz forums-0282fe7024f4cb001d635ebebd98dfdf9af747e8.zip | |
Merge remote-tracking branch 'github-p/ticket/11174' into develop
* github-p/ticket/11174:
[ticket/11174] Check common words, fix array equality assertion.
[ticket/11174] Test for common words.
[ticket/11174] More tests.
[ticket/11174] Clarify why that is the way it is.
[ticket/11174] Started on search tests - keyword splitting.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/search/fulltext_native.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/search/fulltext_native.php b/phpBB/includes/search/fulltext_native.php index bbc2236b3c..bc4ac4bbe0 100644 --- a/phpBB/includes/search/fulltext_native.php +++ b/phpBB/includes/search/fulltext_native.php @@ -59,6 +59,10 @@ class phpbb_search_fulltext_native extends phpbb_search_base { include($this->phpbb_root_path . 'includes/utf/utf_normalizer.' . $this->php_ext); } + if (!function_exists('utf8_decode_ncr')) + { + include($this->phpbb_root_path . 'includes/utf/utf_tools.' . $this->php_ext); + } $error = false; } |