diff options
| author | Matt Friedman <maf675@gmail.com> | 2017-03-24 09:37:14 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2017-03-24 09:37:14 -0700 |
| commit | 91ab27ecc9973d8f929d3e1ec06886fa9e57b979 (patch) | |
| tree | 509c77f3dfbc6ba0b14acf278a76457589a1d9c5 /phpBB/includes | |
| parent | 927220c87372c41abd0d8f4ff30937e7e4befceb (diff) | |
| download | forums-91ab27ecc9973d8f929d3e1ec06886fa9e57b979.tar forums-91ab27ecc9973d8f929d3e1ec06886fa9e57b979.tar.gz forums-91ab27ecc9973d8f929d3e1ec06886fa9e57b979.tar.bz2 forums-91ab27ecc9973d8f929d3e1ec06886fa9e57b979.tar.xz forums-91ab27ecc9973d8f929d3e1ec06886fa9e57b979.zip | |
[ticket/15142] Check extension updates on current branch
PHPBB3-15142
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index ef5f78d5bf..5d8104aa22 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -323,10 +323,7 @@ class acp_extensions 'UP_TO_DATE_MSG' => $this->user->lang(empty($updates_available) ? 'UP_TO_DATE' : 'NOT_UP_TO_DATE', $md_manager->get_metadata('display-name')), )); - foreach ($updates_available as $branch => $version_data) - { - $template->assign_block_vars('updates_available', $version_data); - } + $template->assign_block_vars('updates_available', $updates_available); } catch (\RuntimeException $e) { @@ -565,7 +562,7 @@ class acp_extensions * @param \phpbb\extension\metadata_manager $md_manager The metadata manager for the version to check. * @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 */ protected function version_check(\phpbb\extension\metadata_manager $md_manager, $force_update = false, $force_cache = false) @@ -584,7 +581,7 @@ class acp_extensions $version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename'], isset($version_check['ssl']) ? $version_check['ssl'] : false); $version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null); - return $updates = $version_helper->get_suggested_updates($force_update, $force_cache); + return $version_helper->get_ext_update_on_branch($force_update, $force_cache); } /** |