diff options
| author | Dhruv Goel <dhruv.goel92@gmail.com> | 2014-06-15 13:04:35 +0530 |
|---|---|---|
| committer | Dhruv Goel <dhruv.goel92@gmail.com> | 2014-06-15 13:04:35 +0530 |
| commit | 587759bd6a8d8bdeea6f8497db7b97f70fde383a (patch) | |
| tree | 0f1cab701f2cf41aace892b6d6854c60d8aae051 /phpBB | |
| parent | 44269b36603d4b1bcba7355cad533f63e8f6e1dd (diff) | |
| parent | 9519c4e8c43e0318612ae67faf09c95e52423952 (diff) | |
| download | forums-587759bd6a8d8bdeea6f8497db7b97f70fde383a.tar forums-587759bd6a8d8bdeea6f8497db7b97f70fde383a.tar.gz forums-587759bd6a8d8bdeea6f8497db7b97f70fde383a.tar.bz2 forums-587759bd6a8d8bdeea6f8497db7b97f70fde383a.tar.xz forums-587759bd6a8d8bdeea6f8497db7b97f70fde383a.zip | |
Merge pull request #2431 from Nicofuma/ticket/12109
[ticket/12109] Bug when setting permissions with "Select all users"
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index b11a083923..6540173433 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -331,14 +331,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) { @@ -471,6 +463,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, @@ -507,6 +507,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)) { |