aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-11 15:03:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-11 15:03:06 +0000
commitbd33acd012f96096e5ef6ba131aac0b260aea6c2 (patch)
treef4781a0c2ef33c6f54c3ab10d3e8a64c04db858c /phpBB/viewforum.php
parent2b72a95734ed6f46d8cfccbbea01132b5de37994 (diff)
downloadforums-bd33acd012f96096e5ef6ba131aac0b260aea6c2.tar
forums-bd33acd012f96096e5ef6ba131aac0b260aea6c2.tar.gz
forums-bd33acd012f96096e5ef6ba131aac0b260aea6c2.tar.bz2
forums-bd33acd012f96096e5ef6ba131aac0b260aea6c2.tar.xz
forums-bd33acd012f96096e5ef6ba131aac0b260aea6c2.zip
some fixes
git-svn-id: file:///svn/phpbb/trunk@7866 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php14
1 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 9709b85752..e2fbc1db40 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -87,6 +87,13 @@ if (!$auth->acl_gets('f_list', 'f_read', $forum_id))
login_box('', $user->lang['LOGIN_VIEWFORUM']);
}
+// Forum is passworded ... check whether access has been granted to this
+// user this session, if not show login box
+if ($forum_data['forum_password'])
+{
+ login_forum_box($forum_data);
+}
+
// Is this forum a link? ... User got here either because the
// number of clicks is being tracked or they guessed the id
if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'])
@@ -103,13 +110,6 @@ if ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'])
redirect($forum_data['forum_link']);
}
-// Forum is passworded ... check whether access has been granted to this
-// user this session, if not show login box
-if ($forum_data['forum_password'])
-{
- login_forum_box($forum_data);
-}
-
// Build navigation links
generate_forum_nav($forum_data);