diff --git a/phpBB/adm/style/acp_forums_copy_perm.html b/phpBB/adm/style/acp_forums_copy_perm.html deleted file mode 100644 index 1fcf2f62a4..0000000000 --- a/phpBB/adm/style/acp_forums_copy_perm.html +++ /dev/null @@ -1,22 +0,0 @@ - - -
{L_COPY_PERMISSIONS_EXPLAIN}
-{L_ACL_LINK}
- - - - diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 6aafce12bc..920214448d 100644 --- a/phpBB/includes/acp/acp_forums.php +++ b/phpBB/includes/acp/acp_forums.php @@ -213,13 +213,7 @@ class acp_forums phpbb_cache_moderators($db, $phpbb_container->get('dbal.tools'), $cache, $auth); $copied_permissions = true; } -/* 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'];