aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-09-07 14:01:18 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-09-07 14:01:18 +0000
commitc8ecf341b909f901bfef997fb5d753011303f716 (patch)
treea1055a32981d18bf0975967168ad11636c800525 /phpBB/includes/acp/acp_forums.php
parenta74fe8a8113f9b20fa8bb16b16d07592d54b7186 (diff)
downloadforums-c8ecf341b909f901bfef997fb5d753011303f716.tar
forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.gz
forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.bz2
forums-c8ecf341b909f901bfef997fb5d753011303f716.tar.xz
forums-c8ecf341b909f901bfef997fb5d753011303f716.zip
Maybe - just maybe - it might a good idea to only allow users actually allowed to change permissions to do so.
git-svn-id: file:///svn/phpbb/trunk@8083 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 41991fdae0..8ac3f2cec7 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -163,7 +163,8 @@ class acp_forums
$forum_perm_from = request_var('forum_perm_from', 0);
// Copy permissions?
- if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'])
+ if ($forum_perm_from && !empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] &&
+ (($action != 'edit') || $auth->acl_get('acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth')))
{
// if we edit a forum delete current permissions first
if ($action == 'edit')
@@ -656,6 +657,7 @@ class acp_forums
'S_PRUNE_STICKY' => ($forum_data['forum_flags'] & FORUM_FLAG_PRUNE_STICKY) ? true : false,
'S_DISPLAY_ACTIVE_TOPICS' => ($forum_data['forum_flags'] & FORUM_FLAG_ACTIVE_TOPICS) ? true : false,
'S_ENABLE_POST_REVIEW' => ($forum_data['forum_flags'] & FORUM_FLAG_POST_REVIEW) ? true : false,
+ 'S_CAN_COPY_PERMISSIONS' => (($action != 'edit') || $auth->acl_get('acl_a_fauth && acl_a_authusers && acl_a_authgroups && acl_a_mauth')),
)
);