diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-11 21:26:52 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-11 21:26:52 +0200 |
| commit | f9a596c544fb6677d822cd78d16987d8e751b729 (patch) | |
| tree | 99245e01d4a87678734da6f539ed2359238a65cf /phpBB/includes/acp | |
| parent | 3bf133c96ca34195024feb16bed812aa8dc77184 (diff) | |
| parent | 450402ea429e654aab01ae934772ddf90d2e6a38 (diff) | |
| download | forums-f9a596c544fb6677d822cd78d16987d8e751b729.tar forums-f9a596c544fb6677d822cd78d16987d8e751b729.tar.gz forums-f9a596c544fb6677d822cd78d16987d8e751b729.tar.bz2 forums-f9a596c544fb6677d822cd78d16987d8e751b729.tar.xz forums-f9a596c544fb6677d822cd78d16987d8e751b729.zip | |
Merge pull request #4761 from VSEphpbb/ticket/15142
[ticket/15142] Check extension updates on current branch
Diffstat (limited to 'phpBB/includes/acp')
| -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); } /** |