diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-24 23:19:54 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-24 23:19:54 +0100 |
| commit | e86f199d165367440d376453b2480f5ba3bff34f (patch) | |
| tree | 24829610a6a7cfb2d73be4ea0df3f6bd4fa4a7ed | |
| parent | 2af371d2f4486453af926af1e19908a441798319 (diff) | |
| parent | 827ded82b8110fd2c587d9d7c84731ee7215b166 (diff) | |
| download | forums-e86f199d165367440d376453b2480f5ba3bff34f.tar forums-e86f199d165367440d376453b2480f5ba3bff34f.tar.gz forums-e86f199d165367440d376453b2480f5ba3bff34f.tar.bz2 forums-e86f199d165367440d376453b2480f5ba3bff34f.tar.xz forums-e86f199d165367440d376453b2480f5ba3bff34f.zip | |
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/15143] Fix display of version update in ACP
| -rw-r--r-- | phpBB/includes/acp/acp_update.php | 5 | ||||
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 10 |
2 files changed, 6 insertions, 9 deletions
diff --git a/phpBB/includes/acp/acp_update.php b/phpBB/includes/acp/acp_update.php index df376765f8..b52f315d7f 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -52,10 +52,7 @@ class acp_update $updates_available = array(); } - foreach ($updates_available as $branch => $version_data) - { - $template->assign_block_vars('updates_available', $version_data); - } + $template->assign_block_vars('updates_available', $updates_available); $update_link = $phpbb_root_path . 'install/app.' . $phpEx; diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index f80d2b16fc..fb330df26f 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -181,7 +181,7 @@ class version_helper $self = $this; $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) { return $self->compare($data['current'], $current_version, '>='); }); @@ -215,7 +215,7 @@ class version_helper $self = $this; $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) { 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_cache Force the use of the cache. Override $force_update. - * @return string + * @return array * @throws version_check_exception */ 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_cache Force the use of the cache. Override $force_update. - * @return string Version info + * @return array Version info * @throws version_check_exception */ 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_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 */ public function get_versions($force_update = false, $force_cache = false) |