diff options
| author | Matt Friedman <maf675@gmail.com> | 2017-04-10 15:47:51 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2017-04-10 15:51:22 -0700 |
| commit | 6ce5ef53cbb91bca32fc653e62e3f898b2855cec (patch) | |
| tree | 5ec61923c567d7ff89657ccca0c350142bc87e50 /phpBB/phpbb/extension/manager.php | |
| parent | ecef296beeb2458f4bdccb1d3bbd05f76a580c12 (diff) | |
| parent | 450402ea429e654aab01ae934772ddf90d2e6a38 (diff) | |
| download | forums-6ce5ef53cbb91bca32fc653e62e3f898b2855cec.tar forums-6ce5ef53cbb91bca32fc653e62e3f898b2855cec.tar.gz forums-6ce5ef53cbb91bca32fc653e62e3f898b2855cec.tar.bz2 forums-6ce5ef53cbb91bca32fc653e62e3f898b2855cec.tar.xz forums-6ce5ef53cbb91bca32fc653e62e3f898b2855cec.zip | |
[ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
Diffstat (limited to 'phpBB/phpbb/extension/manager.php')
| -rw-r--r-- | phpBB/phpbb/extension/manager.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/extension/manager.php b/phpBB/phpbb/extension/manager.php index ca0ff31d5d..e3e6fe4077 100644 --- a/phpBB/phpbb/extension/manager.php +++ b/phpBB/phpbb/extension/manager.php @@ -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); } /** |