aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewforum.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2007-07-16 14:02:06 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2007-07-16 14:02:06 +0000
commit683930ca4a31d502b704bbb9366938b4ed6562b1 (patch)
treecd1f3d62969335b3904f8bcea01a0fa3d8ac70a7 /phpBB/viewforum.php
parentd4675c109aa65a909b97061643222f4f2d9fb140 (diff)
downloadforums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar
forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.gz
forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.bz2
forums-683930ca4a31d502b704bbb9366938b4ed6562b1.tar.xz
forums-683930ca4a31d502b704bbb9366938b4ed6562b1.zip
- Handle forum links/redirects within viewforum if no read permission given (to display login box or error message) (Bug #13467)
- Prevent changing postable forum having subforums to link forum without moving subforums out first git-svn-id: file:///svn/phpbb/trunk@7895 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewforum.php')
-rw-r--r--phpBB/viewforum.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewforum.php b/phpBB/viewforum.php
index 5e056967ae..f015b2402a 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_gets('f_list', 'f_read', $forum_id))
+if (!$auth->acl_gets('f_list', 'f_read', $forum_id) || ($forum_data['forum_type'] == FORUM_LINK && $forum_data['forum_link'] && !$auth->acl_get('f_read', $forum_id)))
{
if ($user->data['user_id'] != ANONYMOUS)
{