aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/controller/helper.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-29 19:13:09 +0200
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-03-29 19:13:09 +0200
commit0647eea742bef8d6ee932462f3775e45a6a05bd6 (patch)
treeb79b88d557989fdd6f166bc45bcec496b63017a8 /phpBB/phpbb/controller/helper.php
parent0b1ed8dbbb3792b97726282fdc630cc242def2ad (diff)
downloadforums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.gz
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.bz2
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.tar.xz
forums-0647eea742bef8d6ee932462f3775e45a6a05bd6.zip
[ticket/13683] Updates tests
PHPBB3-13683
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
-rw-r--r--phpBB/phpbb/controller/helper.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php
index dbf7a9307a..cc0dfdb607 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -71,7 +71,8 @@ class helper
* @param \phpbb\template\template $template Template object
* @param \phpbb\user $user User object
* @param \phpbb\config\config $config Config object
- * @param \phpbb\controller\provider $provider Path provider
+ *
+ * @param \phpbb\controller\provider $provider Path provider
* @param \phpbb\extension\manager $manager Extension manager object
* @param \phpbb\symfony_request $symfony_request Symfony Request object
* @param \phpbb\request\request_interface $request phpBB request object
@@ -146,7 +147,7 @@ class helper
if ($this->config['force_server_vars'])
{
$context->setHost($this->config['server_name']);
- $context->setScheme(substr($this->config['server_protocol'], -4));
+ $context->setScheme(substr($this->config['server_protocol'], 0, -3));
$context->setHttpPort($this->config['server_port']);
$context->setHttpsPort($this->config['server_port']);
$context->setBaseUrl($this->config['script_path']);