diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-11-22 15:52:34 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-11-22 15:52:34 +0100 |
| commit | 0c4a0cac613faa9ebd467fbac1507482e79c59aa (patch) | |
| tree | 8ba7760aa3918d93ad276d88942a07da9d7f69d1 /phpBB/phpbb | |
| parent | 11c9d11482d28bf0ac193ea8c5ac0dd9695162e1 (diff) | |
| parent | a3b18d87ddef00424a2dc35061780e1a7dc2c0c6 (diff) | |
| download | forums-0c4a0cac613faa9ebd467fbac1507482e79c59aa.tar forums-0c4a0cac613faa9ebd467fbac1507482e79c59aa.tar.gz forums-0c4a0cac613faa9ebd467fbac1507482e79c59aa.tar.bz2 forums-0c4a0cac613faa9ebd467fbac1507482e79c59aa.tar.xz forums-0c4a0cac613faa9ebd467fbac1507482e79c59aa.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/path_helper.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/phpbb/path_helper.php b/phpBB/phpbb/path_helper.php index 4a446a5d9d..b49d8d13c2 100644 --- a/phpBB/phpbb/path_helper.php +++ b/phpBB/phpbb/path_helper.php @@ -282,10 +282,16 @@ class path_helper $referer_dir = dirname($referer_dir); } - while (strpos($absolute_board_url, $referer_dir) !== 0) + while (($dir_position = strpos($absolute_board_url, $referer_dir)) !== 0) { $fixed_root_path .= '../'; $referer_dir = dirname($referer_dir); + + // Just return phpbb_root_path if we reach the top directory + if ($referer_dir === '.') + { + return $this->phpbb_root_path; + } } $fixed_root_path .= substr($absolute_board_url, strlen($referer_dir) + 1); |