diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 12:14:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-19 12:14:57 +0200 |
| commit | 4186ced4791cd8ea6c105d462f361be15eaff218 (patch) | |
| tree | 4379d7270a8f89fc2d97ee91ee18e883efdfe0a7 /phpBB/phpbb/controller | |
| parent | eaef881e7d193f0f3fe4ce297091dd440d08e9b3 (diff) | |
| download | forums-4186ced4791cd8ea6c105d462f361be15eaff218.tar forums-4186ced4791cd8ea6c105d462f361be15eaff218.tar.gz forums-4186ced4791cd8ea6c105d462f361be15eaff218.tar.bz2 forums-4186ced4791cd8ea6c105d462f361be15eaff218.tar.xz forums-4186ced4791cd8ea6c105d462f361be15eaff218.zip | |
[ticket/13073] Use just one regex in helper route()
PHPBB3-13073
Diffstat (limited to 'phpBB/phpbb/controller')
| -rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 4b93cd505a..6c78868dbb 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -147,7 +147,7 @@ class helper } else { - $base_url .= preg_replace('#[\\/\\\]$#', '', preg_replace('#^\.#', '', $this->phpbb_root_path)); + $base_url .= preg_replace('#^(?:(\.))+(?:(.+)?)+(?:([\\/\\\])$)#', '$2', $this->phpbb_root_path); } $base_url = $this->filesystem->clean_path($base_url); |