diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-22 15:24:27 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-22 15:24:27 +0100 |
| commit | ab69c79d07563819e9d0be2d98a330673db646bf (patch) | |
| tree | 422d88f75b4048808b6f0969b29992738ab3cc34 | |
| parent | f648fe88d5bb2a6661d008724f255bb6df2799ca (diff) | |
| parent | f3ae5e4cb2cf1f3db1d2b8e2a34e234845712efe (diff) | |
| download | forums-ab69c79d07563819e9d0be2d98a330673db646bf.tar forums-ab69c79d07563819e9d0be2d98a330673db646bf.tar.gz forums-ab69c79d07563819e9d0be2d98a330673db646bf.tar.bz2 forums-ab69c79d07563819e9d0be2d98a330673db646bf.tar.xz forums-ab69c79d07563819e9d0be2d98a330673db646bf.zip | |
Merge branch 'ticket/13358' into ticket/security-171
| -rw-r--r-- | phpBB/includes/acp/acp_extensions.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php index 9bdd8eb458..89fdc8b863 100644 --- a/phpBB/includes/acp/acp_extensions.php +++ b/phpBB/includes/acp/acp_extensions.php @@ -537,7 +537,7 @@ class acp_extensions $version_check = $meta['extra']['version-check']; - $version_helper = new \phpbb\version_helper($this->cache, $this->config, $this->user); + $version_helper = new \phpbb\version_helper($this->cache, $this->config, new \phpbb\file_downloader(), $this->user); $version_helper->set_current_version($meta['version']); $version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename']); $version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null); diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index 8c106cf758..7387ad296e 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -64,7 +64,7 @@ class version_helper * @param \phpbb\file_downloader $file_downloader * @param \phpbb\user $user */ - public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, file_downloader $file_downloader, \phpbb\user $user) + public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, \phpbb\file_downloader $file_downloader, \phpbb\user $user) { $this->cache = $cache; $this->config = $config; |