aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php6
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);