aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-03-28 17:23:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-03-28 17:23:23 +0000
commit9adbf3726a076ae202d2a1f24cddb47ce6a84cbd (patch)
treef38d89ad09564c034d9c5fc044adb9b75784d12b /phpBB/includes/functions.php
parent7e47a8ddb023b3851d9f2d1dd153e535cb41172d (diff)
downloadforums-9adbf3726a076ae202d2a1f24cddb47ce6a84cbd.tar
forums-9adbf3726a076ae202d2a1f24cddb47ce6a84cbd.tar.gz
forums-9adbf3726a076ae202d2a1f24cddb47ce6a84cbd.tar.bz2
forums-9adbf3726a076ae202d2a1f24cddb47ce6a84cbd.tar.xz
forums-9adbf3726a076ae202d2a1f24cddb47ce6a84cbd.zip
#1264 - fix redirecting if page dir is empty
git-svn-id: file:///svn/phpbb/trunk@5745 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions.php')
-rw-r--r--phpBB/includes/functions.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php
index 39068ccbb8..2f73a5c27b 100644
--- a/phpBB/includes/functions.php
+++ b/phpBB/includes/functions.php
@@ -1193,7 +1193,14 @@ function redirect($url)
// Is the uri pointing to the current directory?
if ($pathinfo['dirname'] == '.')
{
- $url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . str_replace('./', '', $url);
+ if ($user->page['page_dir'])
+ {
+ $url = generate_board_url() . '/' . $user->page['page_dir'] . '/' . str_replace('./', '', $url);
+ }
+ else
+ {
+ $url = generate_board_url() . '/' . str_replace('./', '', $url);
+ }
}
else
{