makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

OH NO, WHAT HAS HE DONE?!

Browse source 
- bug in the normalizer, we must renormalize... again...


git-svn-id: file:///svn/phpbb/trunk@8001 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-08-03 04:42:27 +00:00
parent f6bfe8db16
commit 757d630522
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/includes/utf/utf_normalizer.php
View file

@ -123,6 +123,12 @@ class utf_normalizer
include($phpbb_root_path . 'includes/utf/data/utf_nfc_qc.' . $phpEx); 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']); $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); 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; 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']); $str = utf_normalizer::recompose($str, $pos, $len, $GLOBALS['utf_nfkc_qc'], $GLOBALS['utf_compatibility_decomp']);

2
phpBB/install/database_update.php
View file

@ -532,7 +532,7 @@ else
// Checks/Operations that have to be completed prior to starting the update itself // Checks/Operations that have to be completed prior to starting the update itself
$exit = false; $exit = false;
if (version_compare($current_version, '3.0.RC3', '<=')) if (version_compare($current_version, '3.0.RC4', '<='))
{ {
// Define missing language entries... // Define missing language entries...
if (!isset($lang['CLEANING_USERNAMES'])) if (!isset($lang['CLEANING_USERNAMES']))