diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:21:49 -0400 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-07-16 22:21:49 -0400 |
| commit | 82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1 (patch) | |
| tree | e107bdad4072b3dd8c747f1aab4ba6e2df1db5f7 /phpBB/includes/acp/acp_update.php | |
| parent | 825d44fcc2b384729a8eb0c941c5d3509f967e4c (diff) | |
| parent | 7f56c05f2450dbf33e48d2c1b9885353ddd58beb (diff) | |
| download | forums-82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1.tar forums-82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1.tar.gz forums-82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1.tar.bz2 forums-82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1.tar.xz forums-82fa4eff7ebcc10b808de9dacb7520ad0d2e1df1.zip | |
Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympus
* github-bantu/ticket/10263:
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.php
[ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.php
[ticket/10263] Adding unit tests for phpbb_version_compare().
[ticket/10263] Add wrapper for version_compare() that allows the use of A and B
Diffstat (limited to 'phpBB/includes/acp/acp_update.php')
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index b0ce8f1084..931fa53165 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -69,12 +69,9 @@ class acp_update $current_version = (!empty($version_update_from)) ? $version_update_from : $config['version']; - $up_to_date_automatic = (version_compare(str_replace('rc', 'RC', strtolower($current_version)), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; - $up_to_date = (version_compare(str_replace('rc', 'RC', strtolower($config['version'])), str_replace('rc', 'RC', strtolower($latest_version)), '<')) ? false : true; - $template->assign_vars(array( - 'S_UP_TO_DATE' => $up_to_date, - 'S_UP_TO_DATE_AUTO' => $up_to_date_automatic, + 'S_UP_TO_DATE' => phpbb_version_compare($latest_version, $config['version'], '<='), + 'S_UP_TO_DATE_AUTO' => phpbb_version_compare($latest_version, $current_version, '<='), 'S_VERSION_CHECK' => true, 'U_ACTION' => $this->u_action, 'U_VERSIONCHECK_FORCE' => append_sid($this->u_action . '&versioncheck_force=1'), |