Merge branch 'ticket/naderman/9140' into develop-olympus

* ticket/naderman/9140:
  [ticket/9140] Check current board version in incremental update packages
This commit is contained in:
Andreas Fischer 2010-07-12 01:38:39 +02:00
commit eb7254a0c4

View file

@ -192,6 +192,17 @@ class install_update extends module
return; 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... // Check if the update files stored are for the latest version...
if ($this->latest_version != $this->update_info['version']['to']) if ($this->latest_version != $this->update_info['version']['to'])
{ {