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] Merge branch 'ticket/15142' into 32x

Browse Source 
PHPBB3-15142
This commit is contained in:
Matt Friedman
2017-04-10 15:47:51 -07:00
parent ecef296bee 450402ea42
commit 6ce5ef53cb
4 changed files with 363 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/phpbb/extension/manager.php
View File

@@ -573,7 +573,7 @@ class manager
* @param bool $force_update Ignores cached data. Defaults to false.
* @param bool $force_cache Force the use of the cache. Override $force_update.
* @param string $stability Force the stability (null by default).
* @return string
* @return array
* @throws runtime_exception
*/
public function version_check(\phpbb\extension\metadata_manager $md_manager, $force_update = false, $force_cache = false, $stability = null)
@@ -592,7 +592,7 @@ class manager
$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($stability);
return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);
return $version_helper->get_ext_update_on_branch($force_update, $force_cache);
}
/**