mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source
This commit is contained in:
Joas Schilling
2015-04-06 16:54:54 +02:00
parent a11994d424 53ed8a3cd9
commit 201f5cb3fb
3 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/controller/helper.php
View File

@@ -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);