aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php13
1 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 3490523c49..6aa7bceb27 100644
--- a/phpBB/viewforum.php
+++ b/phpBB/viewforum.php
@@ -77,7 +77,7 @@ if (isset($_GET['e']) && !$user->data['is_registered'])
}
// Permissions check
-if (!$auth->acl_get('f_read', $forum_id))
+if (!$auth->acl_gets('f_list', 'f_read', $forum_id))
{
if ($user->data['user_id'] != ANONYMOUS)
{
@@ -114,7 +114,10 @@ if ($forum_data['forum_password'])
generate_forum_nav($forum_data);
// Forum Rules
-generate_forum_rules($forum_data);
+if ($auth->acl_get('f_read', $forum_id))
+{
+ generate_forum_rules($forum_data);
+}
// Do we have subforums?
$active_forum_ary = $moderators = array();
@@ -144,6 +147,12 @@ if (!($forum_data['forum_type'] == FORUM_POST || (($forum_data['forum_flags'] &
page_footer();
}
+// Ok, if someone has only list-access, we only display the forum list
+if (!$auth->acl_get('f_read', $forum_id))
+{
+ page_footer();
+}
+
// Handle marking posts
if ($mark_read == 'topics')
{