From 0e0100c5255dd288cc479274a112e4eb42a4bacf Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Mon, 8 Sep 2008 13:39:34 +0000 Subject: merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838 git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/includes/functions.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/includes/functions.php') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index dc297632d2..3e4ce3474a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -1986,7 +1986,7 @@ function redirect($url, $return = false, $disable_cd_check = false) $url = substr($url, 1); } - $url = $dir . '/' . $url; + $url = (!empty($dir) ? $dir . '/' : '') . $url; $url = generate_board_url() . '/' . $url; } } -- cgit v1.2.1