makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* ticket/nickvergessen/9140:
  [ticket/9140] Check current board version in incremental update packages
This commit is contained in:
Nils Adermann 2010-11-10 19:00:45 +01:00
commit cdb57aaa64
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/install/install_update.php
View file

@ -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']),
));
}