diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-10 19:02:35 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-10 19:02:35 +0100 |
| commit | 2e51e68ca145940462155d5164bf91bb4264d488 (patch) | |
| tree | f2a201546a3aef72eb94e871eb9a7e2fad3549ef /phpBB | |
| parent | 19155c78278dfde745483ba366acafd971f8b912 (diff) | |
| parent | 7b4cdc94a850c95582557d22ea7fd97e716734c7 (diff) | |
| download | forums-2e51e68ca145940462155d5164bf91bb4264d488.tar forums-2e51e68ca145940462155d5164bf91bb4264d488.tar.gz forums-2e51e68ca145940462155d5164bf91bb4264d488.tar.bz2 forums-2e51e68ca145940462155d5164bf91bb4264d488.tar.xz forums-2e51e68ca145940462155d5164bf91bb4264d488.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[develop-olympus] Updating changelog for last minute 3.0.8-RC1 fixes.
[ticket/9140] Check current board version in incremental update packages
[ticket/9891] Updater drops language-selection after database-update
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/install/database_update.php | 2 | ||||
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f50e5a062f..f5d6da94b9 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -402,6 +402,8 @@ </li> <li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9888'>PHPBB3-9888</a>] - Update fails when Bing [Bot] was already added to the users table </li> +<li>[<a href='http://tracker.phpbb.com/browse/PHPBB3-9891'>PHPBB3-9891</a>] - Updater drops language-selection after database-update +</li> </ul> <h4> Improvement diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index 91ecc6d302..a1c3239cbf 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -486,7 +486,7 @@ else <p><?php echo ((isset($lang['INLINE_UPDATE_SUCCESSFUL'])) ? $lang['INLINE_UPDATE_SUCCESSFUL'] : 'The database update was successful. Now you need to continue the update process.'); ?></p> - <p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&lang=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p> + <p><a href="<?php echo append_sid("{$phpbb_root_path}install/index.{$phpEx}", "mode=update&sub=file_check&language=$language"); ?>" class="button1"><?php echo (isset($lang['CONTINUE_UPDATE_NOW'])) ? $lang['CONTINUE_UPDATE_NOW'] : 'Continue the update process now'; ?></a></p> <?php } diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 1399a99a31..39c74d272b 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -194,13 +194,13 @@ class install_update extends module } // Check if the update files are actually meant to update from the current version - if ($config['version'] != $this->update_info['version']['from']) + if ($this->current_version != $this->update_info['version']['from']) { $this->unequal_version = true; $template->assign_vars(array( 'S_ERROR' => true, - 'ERROR_MSG' => sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $config['version'], $this->update_info['version']['from'], $this->update_info['version']['to']), + 'ERROR_MSG' => sprintf($user->lang['INCOMPATIBLE_UPDATE_FILES'], $this->current_version, $this->update_info['version']['from'], $this->update_info['version']['to']), )); } |