From 25b54791f9cc64f3e861a169a8a70d69c0cc2131 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Wed, 11 Feb 2015 13:03:22 +0100 Subject: [ticket/13493] Append page name to base url if it doesn't contain it PHPBB3-13493 --- phpBB/phpbb/controller/helper.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/phpbb') diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index c6c470e91b..dc802751fb 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -142,6 +142,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); -- cgit v1.2.1