diff options
| author | Josh Woody <a_jelly_doughnut@phpbb.com> | 2010-05-05 09:39:47 -0500 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-05-16 18:19:28 +0200 |
| commit | ed0a26ab16282c3e053df46fa3a33185654642b4 (patch) | |
| tree | 38ac6ad2f132586e7ab08e17a3c7f552be5c2c34 /phpBB/includes/functions_admin.php | |
| parent | 63d172e3796ccbfe8e1adb4a9bd48b5dabc0516d (diff) | |
| download | forums-ed0a26ab16282c3e053df46fa3a33185654642b4.tar forums-ed0a26ab16282c3e053df46fa3a33185654642b4.tar.gz forums-ed0a26ab16282c3e053df46fa3a33185654642b4.tar.bz2 forums-ed0a26ab16282c3e053df46fa3a33185654642b4.tar.xz forums-ed0a26ab16282c3e053df46fa3a33185654642b4.zip | |
[ticket/9510] Unable to copy permissions from and to forums you cannot see
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed.
PHPBB3-9510
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 13c2acfd24..4cd2962e3b 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -96,16 +96,12 @@ function make_forum_select($select_id = false, $ignore_id = false, $ignore_acl = $right = $row['right_id']; $disabled = false; - if (!$ignore_acl && $auth->acl_get('f_list', $row['forum_id'])) + if (!$ignore_acl && $auth->acl_gets(array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'), $row['forum_id'])) { if ($only_acl_post && !$auth->acl_get('f_post', $row['forum_id']) || (!$auth->acl_get('m_approve', $row['forum_id']) && !$auth->acl_get('f_noapprove', $row['forum_id']))) { $disabled = true; } - else if (!$only_acl_post && !$auth->acl_gets(array('f_list', 'a_forum', 'a_forumadd', 'a_forumdel'), $row['forum_id'])) - { - $disabled = true; - } } else if (!$ignore_acl) { |