aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install/database_update.php
diff options
context:
space:
mode:
authorDavid M <davidmj@users.sourceforge.net>2007-08-14 18:53:17 +0000
committerDavid M <davidmj@users.sourceforge.net>2007-08-14 18:53:17 +0000
commit3ada3b76f0ce86274647758db029d84a0f404886 (patch)
treed5a80b9c796277e474927aa9e27e1bc438878bb9 /phpBB/install/database_update.php
parente6e0b7f07d7874e8df3b290b18d6e6c6c4c6ade2 (diff)
downloadforums-3ada3b76f0ce86274647758db029d84a0f404886.tar
forums-3ada3b76f0ce86274647758db029d84a0f404886.tar.gz
forums-3ada3b76f0ce86274647758db029d84a0f404886.tar.bz2
forums-3ada3b76f0ce86274647758db029d84a0f404886.tar.xz
forums-3ada3b76f0ce86274647758db029d84a0f404886.zip
add a noramlizer wrapper just for updates
git-svn-id: file:///svn/phpbb/trunk@8032 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/database_update.php')
-rw-r--r--phpBB/install/database_update.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index da8f6e9518..59a6a21689 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -567,6 +567,16 @@ if (version_compare($current_version, '3.0.RC4', '<='))
$modify_users = request_var('modify_users', array(0 => ''));
$new_usernames = request_var('new_usernames', array(0 => ''), true);
+ if (!class_exists('utf_new_normalizer'))
+ {
+ if (!file_exists($phpbb_root_path . 'install/data/new_normalizer.' . $phpEx))
+ {
+ global $lang;
+ trigger_error(sprintf($lang['UPDATE_REQUIRES_FILE'], $phpbb_root_path . 'install/data/new_normalizer.' . $phpEx), E_USER_ERROR);
+ }
+ include($phpbb_root_path . 'install/data/new_normalizer.' . $phpEx);
+ }
+
// the admin decided to change some usernames
if (sizeof($modify_users) && $submit)
{
@@ -601,7 +611,7 @@ if (version_compare($current_version, '3.0.RC4', '<='))
case 'edit':
if (isset($new_usernames[$user_id]))
{
- $data = array('username' => utf8_normalize_nfc($new_usernames[$user_id]));
+ $data = array('username' => utf8_new_normalize_nfc($new_usernames[$user_id]));
// Need to update config, forum, topic, posting, messages, etc.
if ($data['username'] != $row['username'])
{