diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2017-04-11 21:27:19 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2017-04-11 21:27:19 +0200 |
| commit | 675b98c89f75d344ebdc7aa4cd3f074ba9199bb3 (patch) | |
| tree | 54d924f105f59e44f695e4aa0cfc708b5cbff841 /phpBB/phpbb/extension | |
| parent | a26e8a1aa4b274bde4250c23a355a380de5234fa (diff) | |
| parent | 6ce5ef53cbb91bca32fc653e62e3f898b2855cec (diff) | |
| download | forums-675b98c89f75d344ebdc7aa4cd3f074ba9199bb3.tar forums-675b98c89f75d344ebdc7aa4cd3f074ba9199bb3.tar.gz forums-675b98c89f75d344ebdc7aa4cd3f074ba9199bb3.tar.bz2 forums-675b98c89f75d344ebdc7aa4cd3f074ba9199bb3.tar.xz forums-675b98c89f75d344ebdc7aa4cd3f074ba9199bb3.zip | |
Merge pull request #4790 from VSEphpbb/ticket/15142-merge32x
[ticket/15142] merge32x
Diffstat (limited to 'phpBB/phpbb/extension')
| -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); } /** |