diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 16:54:54 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-04-06 16:54:54 +0200 |
| commit | 201f5cb3fb064366b84bd57b123ba536cddb7721 (patch) | |
| tree | 1ffcd0a3dca035323f18541894c582c83b5a50cd /phpBB/phpbb/controller | |
| parent | a11994d42479c9056c550e92928e1103bc75a658 (diff) | |
| parent | 53ed8a3cd9d6c835132f0e33d6d360bb493e0e0a (diff) | |
| download | forums-201f5cb3fb064366b84bd57b123ba536cddb7721.tar forums-201f5cb3fb064366b84bd57b123ba536cddb7721.tar.gz forums-201f5cb3fb064366b84bd57b123ba536cddb7721.tar.bz2 forums-201f5cb3fb064366b84bd57b123ba536cddb7721.tar.xz forums-201f5cb3fb064366b84bd57b123ba536cddb7721.zip | |
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 2790ea4277..340b29306a 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -145,6 +145,12 @@ class helper $base_url = $context->getBaseUrl(); + // Append page name if base URL does not contain it + if (!empty($page_name) && strpos($base_url, '/' . $page_name) === false) + { + $base_url .= '/' . $page_name; + } + // If enable_mod_rewrite is false we need to replace the current front-end by app.php, otherwise we need to remove it. $base_url = str_replace('/' . $page_name, empty($this->config['enable_mod_rewrite']) ? '/app.' . $this->php_ext : '', $base_url); |