diff options
| author |   Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 16:02:21 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-08-17 16:02:21 +0000 |
| commit | aecc7c91787abc8b61326f2f6460aeed9f372b52 (patch) | |
| tree | 9c5e9e09bbacd7b220401ef5ef55c2be430f22b8 | |
| parent | - IE6 is not able to correctly cope with gzip compression (diff) | |
| download | phpbb-aecc7c91787abc8b61326f2f6460aeed9f372b52.tar.gz phpbb-aecc7c91787abc8b61326f2f6460aeed9f372b52.tar.bz2 phpbb-aecc7c91787abc8b61326f2f6460aeed9f372b52.zip | |
oki doki
git-svn-id: file:///svn/phpbb/trunk@8041 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/data/new_normalizer.php | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 15 |
2 files changed, 9 insertions, 8 deletions
diff --git a/phpBB/install/data/new_normalizer.php b/phpBB/install/data/new_normalizer.php index a050520690..bd9920f5cd 100644 --- a/phpBB/install/data/new_normalizer.php +++ b/phpBB/install/data/new_normalizer.php @@ -174,7 +174,7 @@ class utf_new_normalizer include($phpbb_root_path . 'includes/utf/data/utf_canonical_comp.' . $phpEx); } - return utf_normalizer::recompose($str, $pos, $len, &$qc, &$decomp_map); + return utf_normalizer::recompose($str, $pos, $len, $qc, $decomp_map); } } diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 59a6a21689..5179979f5f 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -510,7 +510,7 @@ while ($row = $db->sql_fetchrow($result)) $db->sql_freeresult($result); echo $lang['PREVIOUS_VERSION'] . ' :: <strong>' . $config['version'] . '</strong><br />'; -echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong>'; +echo $lang['UPDATED_VERSION'] . ' :: <strong>' . $updates_to_version . '</strong></p>'; $current_version = str_replace('rc', 'RC', strtolower($config['version'])); $latest_version = str_replace('rc', 'RC', strtolower($updates_to_version)); @@ -554,7 +554,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) )); } ?> - </p><br /><br /> + <br /><br /> <h1><?php echo $lang['CLEANING_USERNAMES']; ?></h1> @@ -767,6 +767,8 @@ if (version_compare($current_version, '3.0.RC4', '<=')) } $db->sql_freeresult($result); + _write_result(false, $errored, $error_ary); + // now retrieve all information about the users and let the admin decide what to do if (sizeof($colliding_users)) { @@ -822,7 +824,7 @@ if (version_compare($current_version, '3.0.RC4', '<=')) // for the admin: keep name, change name (with text input) or delete user $u_action = "database_update.$phpEx?language=$language&type=$inline_update"; ?> -</strong></p><br /><br /> +<br /><br /> <p><?php echo $lang['CHANGE_CLEAN_NAMES']; ?></p> <form id="change_clean_names" method="post" action="<?php echo $u_action; ?>"> @@ -984,8 +986,6 @@ if ($exit) exit; } -_write_result(false, $errored, $error_ary); - // Schema updates ?> <br /><br /> @@ -1583,8 +1583,6 @@ add_log('admin', 'LOG_UPDATE_DATABASE', $orig_version, $updates_to_version); // Now we purge the session table as well as all cache files $cache->purge(); -exit; - ?> </div> @@ -1604,6 +1602,9 @@ exit; <?php +exit; + + /** * Function for triggering an sql statement */ |