diff options
author | David M <davidmj@users.sourceforge.net> | 2007-02-12 23:19:41 +0000 |
---|---|---|
committer | David M <davidmj@users.sourceforge.net> | 2007-02-12 23:19:41 +0000 |
commit | 4d1a25e8a16172e358ce5f4460c3e52dad034d0c (patch) | |
tree | 9197073abddb2c49816ed59b686932baf4e0af1d /phpBB/includes/utf | |
parent | 5227d3ce2109c4d9b62166b85b3b1c29967d30ac (diff) | |
download | forums-4d1a25e8a16172e358ce5f4460c3e52dad034d0c.tar forums-4d1a25e8a16172e358ce5f4460c3e52dad034d0c.tar.gz forums-4d1a25e8a16172e358ce5f4460c3e52dad034d0c.tar.bz2 forums-4d1a25e8a16172e358ce5f4460c3e52dad034d0c.tar.xz forums-4d1a25e8a16172e358ce5f4460c3e52dad034d0c.zip |
#8058
git-svn-id: file:///svn/phpbb/trunk@6983 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/utf')
-rw-r--r-- | phpBB/includes/utf/utf_normalizer.php | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index 542c1aeeb8..c1a0fc9a7b 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -230,8 +230,8 @@ class utf_normalizer // Load some commonly-used tables if (!isset($utf_jamo_index, $utf_jamo_type, $utf_combining_class)) { - global $phpbb_root_path; - include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php'); + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } // Buffer the last ASCII char before the UTF-8 stuff if applicable @@ -920,12 +920,13 @@ class utf_normalizer */ function decompose($str, $pos, $len, &$decomp_map) { - global $utf_combining_class, $phpbb_root_path; + global $utf_combining_class; // Load some commonly-used tables if (!isset($utf_combining_class)) { - include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.php'); + global $phpbb_root_path, $phpEx; + include($phpbb_root_path . 'includes/utf/data/utf_normalizer_common.' . $phpEx); } // UTF char length array |