diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-09-08 13:39:34 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-09-08 13:39:34 +0000 |
| commit | 0e0100c5255dd288cc479274a112e4eb42a4bacf (patch) | |
| tree | 1013fd8ea222d4e4fbab3d360fc25be2d59218b0 /phpBB/includes/functions.php | |
| parent | a32f3a67095327dc3e75c01ba21bbb90ad479c83 (diff) | |
| download | forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.gz forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.bz2 forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.tar.xz forums-0e0100c5255dd288cc479274a112e4eb42a4bacf.zip | |
merge r8829, r8830, r8831, r8832, r8833, r8834, r8835, r8836, r8837, r8838
git-svn-id: file:///svn/phpbb/trunk@8839 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 2 |
1 files changed, 1 insertions, 1 deletions
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; } } |