aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/utf/utf_normalizer.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/utf/utf_normalizer.php')
-rw-r--r--phpBB/includes/utf/utf_normalizer.php9
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