From 9b9c048702fe669220e6e001e140e2daa6d0f0a2 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 01:53:51 +0200 Subject: [PATCH 1/2] [ticket/12109] Bug when setting permissions with "Select all users" https://tracker.phpbb.com/browse/PHPBB3-12109 PHPBB3-12109 --- phpBB/includes/acp/acp_permissions.php | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 1924e2075b..12304b9e66 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -330,14 +330,6 @@ class acp_permissions } } - // Setting permissions screen - $s_hidden_fields = build_hidden_fields(array( - 'user_id' => $user_id, - 'group_id' => $group_id, - 'forum_id' => $forum_id, - 'type' => $permission_type) - ); - // Go through the screens/options needed and present them in correct order foreach ($permission_victim as $victim) { @@ -470,6 +462,14 @@ class acp_permissions // If there are more than 5 forums selected the admin is not able to select all users/groups too. // We need to see if the number of forums can be increased or need to be decreased. + // Setting permissions screen + $s_hidden_fields = build_hidden_fields(array( + 'user_id' => $user_id, + 'group_id' => $group_id, + 'forum_id' => $forum_id, + 'type' => $permission_type) + ); + $template->assign_vars(array( 'U_ACTION' => $this->u_action, 'ANONYMOUS_USER_ID' => ANONYMOUS, @@ -506,6 +506,14 @@ class acp_permissions return; } + // Setting permissions screen + $s_hidden_fields = build_hidden_fields(array( + 'user_id' => $user_id, + 'group_id' => $group_id, + 'forum_id' => $forum_id, + 'type' => $permission_type) + ); + // Do not allow forum_ids being set and no other setting defined (will bog down the server too much) if (sizeof($forum_id) && !sizeof($user_id) && !sizeof($group_id)) { From 9519c4e8c43e0318612ae67faf09c95e52423952 Mon Sep 17 00:00:00 2001 From: Tristan Darricau Date: Sat, 10 May 2014 02:35:51 +0200 Subject: [PATCH 2/2] [ticket/12109] Fix coding style PHPBB3-12109 --- phpBB/includes/acp/acp_permissions.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index 12304b9e66..0555f9b76f 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -467,8 +467,8 @@ class acp_permissions 'user_id' => $user_id, 'group_id' => $group_id, 'forum_id' => $forum_id, - 'type' => $permission_type) - ); + 'type' => $permission_type, + )); $template->assign_vars(array( 'U_ACTION' => $this->u_action, @@ -511,8 +511,8 @@ class acp_permissions 'user_id' => $user_id, 'group_id' => $group_id, 'forum_id' => $forum_id, - 'type' => $permission_type) - ); + 'type' => $permission_type, + )); // Do not allow forum_ids being set and no other setting defined (will bog down the server too much) if (sizeof($forum_id) && !sizeof($user_id) && !sizeof($group_id))