diff options
| -rw-r--r-- | phpBB/includes/utf/utf_normalizer.php | 10 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 |
2 files changed, 9 insertions, 3 deletions
diff --git a/phpBB/includes/utf/utf_normalizer.php b/phpBB/includes/utf/utf_normalizer.php index c1a0fc9a7b..8b5cf5a993 100644 --- a/phpBB/includes/utf/utf_normalizer.php +++ b/phpBB/includes/utf/utf_normalizer.php @@ -123,6 +123,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); + } + $str = utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfc_qc'], $GLOBALS['utf_canonical_decomp']); } @@ -149,10 +155,10 @@ class utf_normalizer include($phpbb_root_path . 'includes/utf/data/utf_nfkc_qc.' . $phpEx); } - if (!isset($GLOBALS['utf_canonical_comp'])) + if (!isset($GLOBALS['utf_compatibility_decomp'])) { global $phpbb_root_path, $phpEx; - include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); + include($phpbb_root_path . 'includes/utf/data/utf_compatibility_decomp.' . $phpEx); } $str = utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']); diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index d39dbbe674..ba4bf5d170 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -532,7 +532,7 @@ else // Checks/Operations that have to be completed prior to starting the update itself $exit = false; -if (version_compare($current_version, '3.0.RC3', '<=')) +if (version_compare($current_version, '3.0.RC4', '<=')) { // Define missing language entries... if (!isset($lang['CLEANING_USERNAMES'])) |