From e5162e7496c2ae9ef5e5a874dab8e0a0409f3d74 Mon Sep 17 00:00:00 2001
From: Chris Smith <toonarmy@phpbb.com>
Date: Fri, 5 Sep 2008 19:09:52 +0000
Subject: Extra slash is included in the redirect url when redirecting to the
 forum root directory. Closes #33605 Fix small mistake in CHANGELOG

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8832 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 e96583f75f..a68ada3540 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -2044,7 +2044,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