aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/data/confusables.php
diff options
context:
space:
mode:
authorNicolas Grekas <nicolas.grekas@gmail.com>2013-11-20 13:47:31 +0100
committerNicolas Grekas <nicolas.grekas@gmail.com>2014-11-08 11:36:13 +0100
commit5a7caf65084369422fdbe4aaaae46e5de69cc594 (patch)
tree2845c69f21c9784457335ab8c43deaf74990a23a /phpBB/install/data/confusables.php
parent1601b61ef923496b8b9f0f13f35023397f2162f3 (diff)
downloadforums-5a7caf65084369422fdbe4aaaae46e5de69cc594.tar
forums-5a7caf65084369422fdbe4aaaae46e5de69cc594.tar.gz
forums-5a7caf65084369422fdbe4aaaae46e5de69cc594.tar.bz2
forums-5a7caf65084369422fdbe4aaaae46e5de69cc594.tar.xz
forums-5a7caf65084369422fdbe4aaaae46e5de69cc594.zip
[feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback
Diffstat (limited to 'phpBB/install/data/confusables.php')
-rw-r--r--phpBB/install/data/confusables.php8
1 files changed, 1 insertions, 7 deletions
diff --git a/phpBB/install/data/confusables.php b/phpBB/install/data/confusables.php
index e3e8c41e62..992207c1ef 100644
--- a/phpBB/install/data/confusables.php
+++ b/phpBB/install/data/confusables.php
@@ -633,14 +633,8 @@ function utf8_new_case_fold_nfkc($text, $option = 'full')
// do the case fold
$text = utf8_new_case_fold($text, $option);
- if (!class_exists('utf_normalizer'))
- {
- global $phpbb_root_path, $phpEx;
- include($phpbb_root_path . 'includes/utf/utf_normalizer.' . $phpEx);
- }
-
// convert to NFKC
- utf_new_normalizer::nfkc($text);
+ $text = Normalizer::normalize($text, Normalizer::NFKC);
// FC_NFKC_Closure, http://www.unicode.org/Public/5.0.0/ucd/DerivedNormalizationProps.txt
$text = strtr($text, $fc_nfkc_closure);