aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-01-12 04:31:15 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-01-12 04:31:15 +0100
commit68d945e93190e04b596a819742b1d88ef5495d4a (patch)
treee67dab7f95c68482a6b447d3bd601732f95e46ff /phpBB/includes
parent7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (diff)
parent826d6aac74303afa3fee78a4874e7ac5ca210630 (diff)
downloadforums-68d945e93190e04b596a819742b1d88ef5495d4a.tar
forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.gz
forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.bz2
forums-68d945e93190e04b596a819742b1d88ef5495d4a.tar.xz
forums-68d945e93190e04b596a819742b1d88ef5495d4a.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/acp/acp_extensions.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_extensions.php b/phpBB/includes/acp/acp_extensions.php
index e3eb0058bf..9fbf2f20f1 100644
--- a/phpBB/includes/acp/acp_extensions.php
+++ b/phpBB/includes/acp/acp_extensions.php
@@ -539,7 +539,7 @@ class acp_extensions
$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->set_file_location($version_check['host'], $version_check['directory'], $version_check['filename'], isset($version_check['ssl']) ? $version_check['ssl'] : false);
$version_helper->force_stability($this->config['extension_force_unstable'] ? 'unstable' : null);
return $updates = $version_helper->get_suggested_updates($force_update, $force_cache);