aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-08-14 18:21:13 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-08-14 18:21:13 +0000
commite6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2 (patch)
tree33dd05aae8fe7db7164b1bf953ac69937cb1bd7a
parentnormalizer does not return, it works via refs. updated the normalizer test to... (diff)
downloadphpbb-e6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2.tar.gz
phpbb-e6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2.tar.bz2
phpbb-e6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2.zip
lest we forget
git-svn-id: file:///svn/phpbb/trunk@8031 89ea8834-ac86-4346-8a33-228a782c2dd0
-rw-r--r--phpBB/includes/utf/utf_normalizer.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php
index e59863199d..3332f3f744 100644
--- a/phpBB/includes/utf/utf_normalizer.php
+++ b/phpBB/includes/utf/utf_normalizer.php
@@ -89,6 +89,12 @@ class utf_normalizer
include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx);
}
+ if (!isset($GLOBALS['utf_canonical_decomp']))
+ {
+ global $phpbb_root_path, $phpEx;
+ include($phpbb_root_path . 'includes/utf/data/utf_canonical_decomp.' . $phpEx);
+ }
+
// Replace any byte in the range 0x00..0x1F, except for \r, \n and \t
// We replace those characters with a 0xFF byte, which is illegal in UTF-8 and will in turn be replaced with a UTF replacement char
$str = strtr(