aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabriel Vazquez <leviatan21@phpbb.com>2010-07-06 12:03:02 +0200
committerAndreas Fischer <bantu@phpbb.com>2010-07-12 01:37:05 +0200
commit2ba6360e439386a8e56d93a88ecaefb3c0f5904c (patch)
tree3ac73a48787842ad61c9c1d2f6e2c77e4915f1eb
parentb7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (diff)
downloadforums-2ba6360e439386a8e56d93a88ecaefb3c0f5904c.tar
forums-2ba6360e439386a8e56d93a88ecaefb3c0f5904c.tar.gz
forums-2ba6360e439386a8e56d93a88ecaefb3c0f5904c.tar.bz2
forums-2ba6360e439386a8e56d93a88ecaefb3c0f5904c.tar.xz
forums-2ba6360e439386a8e56d93a88ecaefb3c0f5904c.zip
[ticket/9140] Check current board version in incremental update packages
Since we do not want to limit the updater functionality we only display a prominent warning when the current board version does not match the version the update files are meant to update from. PHPBB3-9140
-rw-r--r--phpBB/install/install_update.php11
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'])
{