diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-28 10:41:55 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-28 10:41:55 +0000 |
| commit | 5d52b5185300af5d13dc5db7062759bce7ee949e (patch) | |
| tree | 7279f4dc19cda7abbff0688afae1b4cbc5ee79ed /phpBB/install/database_update.php | |
| parent | 48db93349e1e7b8a23b8724d941e0396ca06175f (diff) | |
| download | forums-5d52b5185300af5d13dc5db7062759bce7ee949e.tar forums-5d52b5185300af5d13dc5db7062759bce7ee949e.tar.gz forums-5d52b5185300af5d13dc5db7062759bce7ee949e.tar.bz2 forums-5d52b5185300af5d13dc5db7062759bce7ee949e.tar.xz forums-5d52b5185300af5d13dc5db7062759bce7ee949e.zip | |
let it work under different languages.
git-svn-id: file:///svn/phpbb/trunk@7967 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/install/database_update.php')
| -rw-r--r-- | phpBB/install/database_update.php | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index ffdedf0fd9..ffd4774c59 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -493,16 +493,25 @@ else $exit = false; if (version_compare($current_version, '3.0.RC3', '<=')) { + // Define missing language entries... if (!isset($lang['CLEANING_USERNAMES'])) { - $lang['CLEANING_USERNAMES'] = 'Cleaning usernames'; + $lang = array_merge($lang, array( + 'CLEANING_USERNAMES' => 'Cleaning usernames', + 'LONG_SCRIPT_EXECUTION' => 'Please note that this can take a while... Please do not stop the script.', + 'CHANGE_CLEAN_NAMES' => 'The method used to make sure a username is not used by multiple users has been changed. There are some users which have the same name when compared with the new method. You have to delete or rename these users to make sure that each name is only used by one user before you can proceed.', + 'USER_ACTIVE' => 'Active user', + 'USER_INACTIVE' => 'Inactive user', + 'BOT' => 'Spider/Robot', + 'UPDATE_REQUIRES_FILE' => 'The updater requires that the following file is present: %s', + + 'DELETE_USER_REMOVE' => 'Delete user and remove posts', + 'DELETE_USER_RETAIN' => 'Delete user but keep posts', + 'EDIT_USERNAME' => 'Edit username', + 'KEEP_OLD_NAME' => 'Keep username', + 'NEW_USERNAME' => 'New username', + )); } - - if (!isset($lang['LONG_SCRIPT_EXECUTION'])) - { - $lang['LONG_SCRIPT_EXECUTION'] = 'Please note that this can take a while... Please do not stop the script.'; - } - ?> </p><br /><br /> @@ -1212,7 +1221,14 @@ if (version_compare($current_version, '3.0.RC3', '<=')) break; } - $needed_creation[$table_name][$good_index] = 1; + // If the good index already exist we do not need to create it again... + if (($map_dbms == 'mysql_40' || $map_dbms == 'mysql_41') && $bad_index == $good_index) + { + } + else + { + $needed_creation[$table_name][$good_index] = 1; + } } } } |