mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/15142] Check extension updates on current branch

Browse Source 
PHPBB3-15142
This commit is contained in:
Matt Friedman
2017-03-24 09:37:14 -07:00
parent 927220c873
commit 91ab27ecc9
2 changed files with 59 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
phpBB/includes/acp/acp_extensions.php
View File

@@ -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);
}
/**