mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-29 10:39:19 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.2.x'

Browse Source 
* 3.2.x:
  [ticket/15143] Fix display of version update in ACP
This commit is contained in:
Tristan Darricau 2017-03-24 23:20:08 +01:00
commit e4c13af894
No known key found for this signature in database
GPG Key ID: 817043C2E29DB881
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
phpBB/includes/acp/acp_update.php
View File

@ -52,10 +52,7 @@ class acp_update
$updates_available = array(); $updates_available = array();
} }
foreach ($updates_available as $branch => $version_data) $template->assign_block_vars('updates_available', $updates_available);
{
$template->assign_block_vars('updates_available', $version_data);
}
$update_link = $phpbb_root_path . 'install/app.' . $phpEx; $update_link = $phpbb_root_path . 'install/app.' . $phpEx;

10
phpBB/phpbb/version_helper.php
View File

@ -181,7 +181,7 @@ class version_helper
$self = $this; $self = $this;
$current_version = $this->current_version; $current_version = $this->current_version;
// Filter out any versions less than to the current version // Filter out any versions less than the current version
$versions = array_filter($versions, function($data) use ($self, $current_version) { $versions = array_filter($versions, function($data) use ($self, $current_version) {
return $self->compare($data['current'], $current_version, '>='); return $self->compare($data['current'], $current_version, '>=');
}); });
@ -215,7 +215,7 @@ class version_helper
$self = $this; $self = $this;
$current_version = $this->current_version; $current_version = $this->current_version;
// Filter out any versions less than to the current version // Filter out any versions less than the current version
$versions = array_filter($versions, function($data) use ($self, $current_version) { $versions = array_filter($versions, function($data) use ($self, $current_version) {
return $self->compare($data['current'], $current_version, '>='); return $self->compare($data['current'], $current_version, '>=');
}); });
@ -245,7 +245,7 @@ class version_helper
* *
* @param bool $force_update Ignores cached data. Defaults to false. * @param bool $force_update Ignores cached data. Defaults to false.
* @param bool $force_cache Force the use of the cache. Override $force_update. * @param bool $force_cache Force the use of the cache. Override $force_update.
* @return string * @return array
* @throws version_check_exception * @throws version_check_exception
*/ */
public function get_suggested_updates($force_update = false, $force_cache = false) public function get_suggested_updates($force_update = false, $force_cache = false)
@ -266,7 +266,7 @@ class version_helper
* *
* @param bool $force_update Ignores cached data. Defaults to false. * @param bool $force_update Ignores cached data. Defaults to false.
* @param bool $force_cache Force the use of the cache. Override $force_update. * @param bool $force_cache Force the use of the cache. Override $force_update.
* @return string Version info * @return array Version info
* @throws version_check_exception * @throws version_check_exception
*/ */
public function get_versions_matching_stability($force_update = false, $force_cache = false) public function get_versions_matching_stability($force_update = false, $force_cache = false)
@ -286,7 +286,7 @@ class version_helper
* *
* @param bool $force_update Ignores cached data. Defaults to false. * @param bool $force_update Ignores cached data. Defaults to false.
* @param bool $force_cache Force the use of the cache. Override $force_update. * @param bool $force_cache Force the use of the cache. Override $force_update.
* @return string Version info, includes stable and unstable data * @return array Version info, includes stable and unstable data
* @throws version_check_exception * @throws version_check_exception
*/ */
public function get_versions($force_update = false, $force_cache = false) public function get_versions($force_update = false, $force_cache = false)