diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-02 15:23:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-02 15:23:33 +0000 |
| commit | a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5 (patch) | |
| tree | e13dd92e386cb98de51bd0730fdd569efe6e5f36 /phpBB/includes/functions.php | |
| parent | 21a002e4ac28f8e65e2c865eb171a44ac4054044 (diff) | |
| download | forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.gz forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.bz2 forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.tar.xz forums-a3bf1ed63ec7aa281b0d47d6f3e87eeeeafbaff5.zip | |
some updates; and hopefully not completely breaking redirects (again). :D You know, i like breaking things.
git-svn-id: file:///svn/phpbb/trunk@6544 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 21abbad392..27b935d759 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1464,7 +1464,7 @@ function generate_board_url($without_script_path = false) */ function redirect($url, $return = false) { - global $db, $cache, $config, $user; + global $db, $cache, $config, $user, $phpbb_root_path; if (empty($user->lang)) { @@ -1521,8 +1521,8 @@ function redirect($url, $return = false) } else { - // Get the realpath of dirname - $root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath('./'))); + // Used ./ before, but $phpbb_root_path is working better with urls within another root path + $root_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($phpbb_root_path))); $page_dirs = explode('/', str_replace('\\', '/', phpbb_realpath($pathinfo['dirname']))); $intersection = array_intersect_assoc($root_dirs, $page_dirs); |