diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-12 01:38:39 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-12 01:38:39 +0200 |
| commit | eb7254a0c455ef3bae098eb86c016c639aea9104 (patch) | |
| tree | ad25ee438e7d65a0de6258f75196de4a2b60a147 | |
| parent | 6724b799676562cfb8ade6e19c77cc9d8cb238c7 (diff) | |
| parent | 2ba6360e439386a8e56d93a88ecaefb3c0f5904c (diff) | |
| download | forums-eb7254a0c455ef3bae098eb86c016c639aea9104.tar forums-eb7254a0c455ef3bae098eb86c016c639aea9104.tar.gz forums-eb7254a0c455ef3bae098eb86c016c639aea9104.tar.bz2 forums-eb7254a0c455ef3bae098eb86c016c639aea9104.tar.xz forums-eb7254a0c455ef3bae098eb86c016c639aea9104.zip | |
Merge branch 'ticket/naderman/9140' into develop-olympus
* ticket/naderman/9140:
[ticket/9140] Check current board version in incremental update packages
| -rw-r--r-- | phpBB/install/install_update.php | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index e717fe3dd4..6184cbbc33 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -192,6 +192,17 @@ class install_update extends module return; } + // Check if the update files are actually meant to update from the current version + if ($config['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']), + )); + } + // Check if the update files stored are for the latest version... if ($this->latest_version != $this->update_info['version']['to']) { |