diff options
author | Tristan Darricau <github@nicofuma.fr> | 2014-09-28 23:32:56 +0200 |
---|---|---|
committer | Tristan Darricau <github@nicofuma.fr> | 2014-09-28 23:32:56 +0200 |
commit | a159899d028d56f09efd79dd3e3abf5b3a7abc7b (patch) | |
tree | c6709ad428881e8ebad451ce1a12376573a63ba5 /phpBB/phpbb/controller | |
parent | Merge pull request #2996 from Senky/ticket/13104 (diff) | |
download | phpbb-a159899d028d56f09efd79dd3e3abf5b3a7abc7b.tar.gz phpbb-a159899d028d56f09efd79dd3e3abf5b3a7abc7b.tar.bz2 phpbb-a159899d028d56f09efd79dd3e3abf5b3a7abc7b.zip |
[ticket/13113] Updates the base url only when the front-end isn't app.php
PHPBB3-13113
Diffstat (limited to 'phpBB/phpbb/controller')
-rw-r--r-- | phpBB/phpbb/controller/helper.php | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index fc19b855c0..187e455d48 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -140,14 +140,17 @@ class helper // 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); - // We need to update the base url to move to the directory of the app.php file - if (empty($this->config['enable_mod_rewrite'])) + // 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') { - $base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url); - } - else - { - $base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path); + if (empty($this->config['enable_mod_rewrite'])) + { + $base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . 'app.' . $this->php_ext, $base_url); + } + else + { + $base_url .= preg_replace(get_preg_expression('path_remove_dot_trailing_slash'), '$2', $this->phpbb_root_path); + } } $base_url = $this->filesystem->clean_path($base_url); |