diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-10 19:00:45 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-10 19:00:45 +0100 |
| commit | cdb57aaa64b758b5089bc8582df64d0ce0f74c9e (patch) | |
| tree | c9b88fa9e5a6e4857292de47cfe91d51e7eb0021 | |
| parent | cb94085323b7302ddc582c3df12bc2bd3275e620 (diff) | |
| parent | 4340e5a217e53654616add2801df244d2ca8da7b (diff) | |
| download | forums-cdb57aaa64b758b5089bc8582df64d0ce0f74c9e.tar forums-cdb57aaa64b758b5089bc8582df64d0ce0f74c9e.tar.gz forums-cdb57aaa64b758b5089bc8582df64d0ce0f74c9e.tar.bz2 forums-cdb57aaa64b758b5089bc8582df64d0ce0f74c9e.tar.xz forums-cdb57aaa64b758b5089bc8582df64d0ce0f74c9e.zip | |
Merge branch 'ticket/nickvergessen/9140' into develop-olympus
* ticket/nickvergessen/9140:
[ticket/9140] Check current board version in incremental update packages
| -rw-r--r-- | phpBB/install/install_update.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index 6184cbbc33..ec76f2a407 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -193,13 +193,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']), )); } |