diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-11-21 18:07:36 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-11-21 21:37:43 +0100 |
| commit | 2793f9c078272b178250ed4e0812219b9c5c1676 (patch) | |
| tree | aed6e4541d3c5196b9a4aefeac9e7437da90a246 /phpBB/phpbb | |
| parent | a080173010c60fdc5b143c8341d18fcbb195f889 (diff) | |
| download | forums-2793f9c078272b178250ed4e0812219b9c5c1676.tar forums-2793f9c078272b178250ed4e0812219b9c5c1676.tar.gz forums-2793f9c078272b178250ed4e0812219b9c5c1676.tar.bz2 forums-2793f9c078272b178250ed4e0812219b9c5c1676.tar.xz forums-2793f9c078272b178250ed4e0812219b9c5c1676.zip | |
[ticket/13358] Add file_downloader to version_helper
PHPBB3-13358
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/version_helper.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/phpbb/version_helper.php b/phpBB/phpbb/version_helper.php index c3c3602944..3b455ec5ba 100644 --- a/phpBB/phpbb/version_helper.php +++ b/phpBB/phpbb/version_helper.php @@ -50,6 +50,9 @@ class version_helper /** @var \phpbb\config\config */ protected $config; + /** @var \phpbb\file_downloader */ + protected $file_downloader; + /** @var \phpbb\user */ protected $user; @@ -58,12 +61,14 @@ class version_helper * * @param \phpbb\cache\service $cache * @param \phpbb\config\config $config + * @param \phpbb\file_downloader $file_downloader * @param \phpbb\user $user */ - public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, \phpbb\user $user) + public function __construct(\phpbb\cache\service $cache, \phpbb\config\config $config, file_downloader $file_downloader, \phpbb\user $user) { $this->cache = $cache; $this->config = $config; + $this->file_downloader = $file_downloader; $this->user = $user; if (defined('PHPBB_QA')) @@ -250,7 +255,9 @@ class version_helper else if ($info === false || $force_update) { $errstr = $errno = ''; - $info = get_remote_file($this->host, $this->path, $this->file, $errstr, $errno); + $this->file_downloader->set_error_number($errno) + ->set_error_string($errstr); + $info = $this->file_downloader->get($this->host, $this->path, $this->file); if (!empty($errstr)) { |