diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 00:49:29 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-30 00:49:29 +0200 |
| commit | 09de06cf15071fd88a1bf3554007aab2a4faadf4 (patch) | |
| tree | 9ff7b68d17dd0fb45f5ac259b47f916a4ab57937 /phpBB | |
| parent | db78c11702d96daa3c4b1142dd5ca932b4656706 (diff) | |
| parent | 69feffec8b4be93dab6d0163cb5782404ead6b4e (diff) | |
| download | forums-09de06cf15071fd88a1bf3554007aab2a4faadf4.tar forums-09de06cf15071fd88a1bf3554007aab2a4faadf4.tar.gz forums-09de06cf15071fd88a1bf3554007aab2a4faadf4.tar.bz2 forums-09de06cf15071fd88a1bf3554007aab2a4faadf4.tar.xz forums-09de06cf15071fd88a1bf3554007aab2a4faadf4.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10917] Variable used only once so delete it
[ticket/10917] Revert use of phpbb wrapper
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/install_update.php | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/phpBB/install/install_update.php b/phpBB/install/install_update.php index a4d614b1bf..0cd203eda8 100644 --- a/phpBB/install/install_update.php +++ b/phpBB/install/install_update.php @@ -57,7 +57,6 @@ class install_update extends module var $new_location; var $latest_version; var $current_version; - var $unequal_version; var $update_to_version; @@ -82,7 +81,6 @@ class install_update extends module $this->tpl_name = 'install_update'; $this->page_title = 'UPDATE_INSTALLATION'; - $this->unequal_version = false; $this->old_location = $phpbb_root_path . 'install/update/old/'; $this->new_location = $phpbb_root_path . 'install/update/new/'; @@ -192,8 +190,6 @@ class install_update extends module // Check if the update files are actually meant to update from the current version 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'], $this->current_version, $this->update_info['version']['from'], $this->update_info['version']['to']), @@ -201,10 +197,8 @@ class install_update extends module } // Check if the update files stored are for the latest version... - if (phpbb_version_compare($this->latest_version, $this->update_info['version']['to'], '>')) + if (version_compare(strtolower($this->latest_version), strtolower($this->update_info['version']['to']), '>')) { - $this->unequal_version = true; - $template->assign_vars(array( 'S_WARNING' => true, 'WARNING_MSG' => sprintf($user->lang['OLD_UPDATE_FILES'], $this->update_info['version']['from'], $this->update_info['version']['to'], $this->latest_version)) @@ -291,7 +285,7 @@ class install_update extends module ); // Print out version the update package updates to - if ($this->unequal_version) + if ($this->latest_version != $this->update_info['version']['to']) { $template->assign_var('PACKAGE_VERSION', $this->update_info['version']['to']); } |