diff options
| author |   Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-27 18:43:29 +0200 |
|---|---|---|
| committer | Tristan Darricau <tristan.darricau@sensiolabs.com> | 2016-03-29 19:06:30 +0200 |
| commit | 1a5fbd4bd06e7ae7a89637c0977da2fed8cd62fb (patch) | |
| tree | 1a4272d41bbf2d354cb8a163ff707fcbe5762a5f /phpBB/phpbb/controller | |
| parent | Merge pull request #4021 from marc1706/ticket/14272 (diff) | |
| download | phpbb-1a5fbd4bd06e7ae7a89637c0977da2fed8cd62fb.tar.gz phpbb-1a5fbd4bd06e7ae7a89637c0977da2fed8cd62fb.tar.bz2 phpbb-1a5fbd4bd06e7ae7a89637c0977da2fed8cd62fb.zip | |
[ticket/13683] Respects force_server_vars settings when generating URLs
PHPBB3-13683
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 8 |
1 files changed, 8 insertions, 0 deletions
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); |