aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search/fulltext_mysql.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2012-12-09 21:02:31 +0100
committerMarc Alexander <admin@m-a-styles.de>2012-12-09 21:02:31 +0100
commit1aae72961a3205a8487218b6d69361c43a1297d6 (patch)
tree3096a599c14c88084f782022f002ed84224ccf8b /phpBB/includes/search/fulltext_mysql.php
parent26bde05a30c7111b57621a37d86425aa69d74263 (diff)
parent3fe381eed561e724700b21789e28ea3efb1f7ef9 (diff)
downloadforums-1aae72961a3205a8487218b6d69361c43a1297d6.tar
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.gz
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.bz2
forums-1aae72961a3205a8487218b6d69361c43a1297d6.tar.xz
forums-1aae72961a3205a8487218b6d69361c43a1297d6.zip
Merge branch 'develop' into feature/avatars
Conflicts: phpBB/install/database_update.php
Diffstat (limited to 'phpBB/includes/search/fulltext_mysql.php')
-rw-r--r--phpBB/includes/search/fulltext_mysql.php10
1 files changed, 9 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)