diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:05:41 +0100 |
| commit | 6ebc26e330d5e204eab0ac9061bb5817534047fe (patch) | |
| tree | 417aa508a0b4282ec0ae1834ea02032e7e033d5f /phpBB/includes/acp/acp_forums.php | |
| parent | f0eb18fffd11a97383c8ccf2ae7d2838939f09e2 (diff) | |
| parent | 8d12b40fc4fdf50517e9584d14a5edd311953e7c (diff) | |
| download | forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.gz forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.bz2 forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.tar.xz forums-6ebc26e330d5e204eab0ac9061bb5817534047fe.zip | |
Merge commit 'release-3.0.6-RC3'
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 62ccbdb68e..2ff597ee98 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -193,18 +193,19 @@ class acp_forums $cache->destroy('sql', FORUMS_TABLE); // Copy permissions? - if (!empty($forum_perm_from) && $forum_perm_from != $forum_data['forum_id'] && - (($action != 'edit') || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) + if ($forum_perm_from && $forum_perm_from != $forum_data['forum_id'] && + ($action != 'edit' || empty($forum_id) || ($auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')))) { copy_forum_permissions($forum_perm_from, $forum_data['forum_id'], ($action == 'edit') ? true : false); cache_moderators(); } - else if (($action != 'edit') && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')) +/* Commented out because of questionable UI workflow - re-visit for 3.0.7 + else if (!$this->parent_id && $action != 'edit' && $auth->acl_get('a_fauth') && $auth->acl_get('a_authusers') && $auth->acl_get('a_authgroups') && $auth->acl_get('a_mauth')) { $this->copy_permission_page($forum_data); return; } - +*/ $auth->acl_clear_prefetch(); $acl_url = '&mode=setting_forum_local&forum_id[]=' . $forum_data['forum_id']; @@ -1919,6 +1920,7 @@ class acp_forums /** * Display copy permission page + * Not used at the moment - we will have a look at it for 3.0.7 */ function copy_permission_page($forum_data) { |