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_main.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_main.php')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index 60cebe3c08..68445d814f 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -415,11 +415,8 @@ class acp_main { $latest_version_info = explode("\n", $latest_version_info); - $latest_version = str_replace('rc', 'RC', strtolower(trim($latest_version_info[0]))); - $current_version = str_replace('rc', 'RC', strtolower($config['version'])); - $template->assign_vars(array( - 'S_VERSION_UP_TO_DATE' => version_compare($current_version, $latest_version, '<') ? false : true, + 'S_VERSION_UP_TO_DATE' => phpbb_version_compare(trim($latest_version_info[0]), $config['version'], '<='), )); } |