From 53e7e3d801b56d0ee05581e808dceab2ec13b359 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Sun, 7 Jul 2024 08:44:32 +0200 Subject: [PATCH] [ticket/17341] Remove no longer used files and references PHPBB-17341 --- phpBB/adm/style/acp_forums_copy_perm.html | 22 ---------------------- phpBB/includes/acp/acp_forums.php | 8 +------- 2 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 phpBB/adm/style/acp_forums_copy_perm.html 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}

- -

{L_COPY_PERMISSIONS_EXPLAIN}

-

{L_ACL_LINK}

- -
- -
-
-

{L_COPY_PERMISSIONS_EXPLAIN}
-
-
-
{S_FORM_TOKEN}{S_HIDDEN_FIELDS} -   -
-
- -
- - 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'];