diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 18:48:24 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 18:48:24 +0200 |
| commit | 9bf58697dcc18881086d1bcc4565a6ae77b4dd17 (patch) | |
| tree | bc00d0e8aaef05925e229cb781b2475d3125f8f1 /phpBB/phpbb/controller/helper.php | |
| parent | 5091600a16eeee4dbd4c40ca1f051a9774887100 (diff) | |
| parent | 3418683cfcfd99235c680e28c60f066c3b36915a (diff) | |
| download | forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.gz forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.bz2 forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.tar.xz forums-9bf58697dcc18881086d1bcc4565a6ae77b4dd17.zip | |
Merge branch 'ticket/13073' into ticket/13073-develop
Conflicts:
tests/controller/common_helper_route.php
Diffstat (limited to 'phpBB/phpbb/controller/helper.php')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index e2932086db..fc19b855c0 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -140,8 +140,15 @@ 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. - $base_url = str_replace('/app.' . $this->php_ext, '/' . $this->phpbb_root_path . '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'])) + { + $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); |