aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/search/fulltext_postgres.php
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-12-07 21:14:39 -0600
committerNathan Guse <nathaniel.guse@gmail.com>2012-12-07 21:14:39 -0600
commit0042f071476b75258f5f8ea0b5b9fcb445ffde23 (patch)
tree67cbafd7c655ad94809fef5f7dbe3a23525b232b /phpBB/includes/search/fulltext_postgres.php
parentc911a34b5b7541b46ee2408da366d2dc7c302090 (diff)
parentb7b8fefdd084b51c93b15dfdfb34d2ef294f4d76 (diff)
downloadforums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar
forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.gz
forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.bz2
forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.tar.xz
forums-0042f071476b75258f5f8ea0b5b9fcb445ffde23.zip
Merge branch 'develop' of github.com:EXreaction/phpbb3 into ticket/11103
Conflicts: phpBB/install/database_update.php phpBB/styles/prosilver/template/ucp_prefs_personal.html phpBB/styles/subsilver2/template/ucp_prefs_personal.html
Diffstat (limited to 'phpBB/includes/search/fulltext_postgres.php')
-rw-r--r--phpBB/includes/search/fulltext_postgres.php8
1 files changed, 8 insertions, 0 deletions
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;
}