diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-04-07 21:59:26 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-04-07 21:59:26 +0200 |
| commit | 9ad5c577f5f02c723e39d63963e04dbbbfabacf8 (patch) | |
| tree | 1e45916ee3511e0f5086cce25d6d70b10a74f1fd /phpBB | |
| parent | 12f5c0405e7a4bd3b1ab39a6773a504eecc3c2b3 (diff) | |
| parent | bfc09e2b399f880536561c610286ddda60daabf2 (diff) | |
| download | forums-9ad5c577f5f02c723e39d63963e04dbbbfabacf8.tar forums-9ad5c577f5f02c723e39d63963e04dbbbfabacf8.tar.gz forums-9ad5c577f5f02c723e39d63963e04dbbbfabacf8.tar.bz2 forums-9ad5c577f5f02c723e39d63963e04dbbbfabacf8.tar.xz forums-9ad5c577f5f02c723e39d63963e04dbbbfabacf8.zip | |
Merge pull request #4256 from Nicofuma/ticket/13683
[ticket/13683] Respects force_server_vars settings when generating URLs
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 08a63639b9..ce6bfba981 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 @@ -143,6 +144,15 @@ 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'], 0, -3)); + $context->setHttpPort($this->config['server_port']); + $context->setHttpsPort($this->config['server_port']); + $context->setBaseUrl(rtrim($this->config['script_path'], '/')); + } + $script_name = $this->symfony_request->getScriptName(); $page_name = substr($script_name, -1, 1) == '/' ? '' : utf8_basename($script_name); @@ -158,7 +168,7 @@ class helper $base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url); // We need to update the base url to move to the directory of the app.php file if the current script is not app.php - if ($page_name !== 'app.php') + if ($page_name !== 'app.php' && !$this->config['force_server_vars']) { if (empty($this->config['enable_mod_rewrite'])) { |