From 1a5fbd4bd06e7ae7a89637c0977da2fed8cd62fb Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sun, 27 Mar 2016 18:43:29 +0200 Subject: [ticket/13683] Respects force_server_vars settings when generating URLs PHPBB3-13683 --- phpBB/phpbb/controller/helper.php | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'phpBB/phpbb/controller/helper.php') diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 08a63639b9..75b7515540 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -143,6 +143,14 @@ class helper $context = new RequestContext(); $context->fromRequest($this->symfony_request); + if ($this->config['force_server_vars']) { + $context->setHost($this->config['server_name']); + $context->setScheme(substr($this->config['server_protocol'], -4)); + $context->setHttpPort($this->config['server_port']); + $context->setHttpsPort($this->config['server_port']); + $context->setBaseUrl($this->config['script_path'] . '/app.php'); + } + $script_name = $this->symfony_request->getScriptName(); $page_name = substr($script_name, -1, 1) == '/' ? '' : utf8_basename($script_name); -- cgit v1.2.1