makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'ticket/13358' into ticket/security-171

Browse source
This commit is contained in:
Marc Alexander 2014-11-22 15:24:27 +01:00
commit ab69c79d07
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/includes/acp/acp_extensions.php
View file

@ -537,7 +537,7 @@ class acp_extensions
$version_check = $meta['extra']['version-check']; $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_current_version($meta['version']);
$version_helper->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename']); $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); $version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);

2
phpBB/phpbb/version_helper.php
View file

@ -64,7 +64,7 @@ class version_helper
* @param \phpbb\file_downloader $file_downloader * @param \phpbb\file_downloader $file_downloader
* @param \phpbb\user $user * @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->cache = $cache;
$this->config = $config; $this->config = $config;