diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-03-24 23:18:50 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-03-24 23:18:50 +0100 |
| commit | 827ded82b8110fd2c587d9d7c84731ee7215b166 (patch) | |
| tree | 31cc7b5195f8b9136c05302cfca9ba4db11b03c4 | |
| parent | 927220c87372c41abd0d8f4ff30937e7e4befceb (diff) | |
| parent | 45c3cb52e43ba662209310e761644789b541b786 (diff) | |
| download | forums-827ded82b8110fd2c587d9d7c84731ee7215b166.tar forums-827ded82b8110fd2c587d9d7c84731ee7215b166.tar.gz forums-827ded82b8110fd2c587d9d7c84731ee7215b166.tar.bz2 forums-827ded82b8110fd2c587d9d7c84731ee7215b166.tar.xz forums-827ded82b8110fd2c587d9d7c84731ee7215b166.zip | |
Merge pull request #4757 from VSEphpbb/ticket/15143
[ticket/15143] Fix display of version update in ACP
* github.com:phpbb/phpbb:
[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 51ff4870f2..cee2ce222e 100644 --- a/phpBB/includes/acp/acp_update.php +++ b/phpBB/includes/acp/acp_update.php @@ -51,10 +51,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 = append_sid($phpbb_root_path . 'install/'); diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 135d390584..b00f4f1d5f 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -184,7 +184,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, '>='); }); @@ -218,7 +218,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, '>='); }); @@ -248,7 +248,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 \RuntimeException */ public function get_suggested_updates($force_update = false, $force_cache = false) @@ -269,7 +269,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 \RuntimeException */ public function get_versions_matching_stability($force_update = false, $force_cache = false) @@ -289,7 +289,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 \RuntimeException */ public function get_versions($force_update = false, $force_cache = false) |