diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-06-15 13:05:53 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-06-15 13:05:53 +0530 |
| commit | aaa9a4b0e629d6109e6d92ac0ee79298594da204 (patch) | |
| tree | 350f3f370bf272df4393b6e74114c9fa556ad919 | |
| parent | 13fedd4764d5699940e7f1abfc4d77447be6bdf9 (diff) | |
| parent | 587759bd6a8d8bdeea6f8497db7b97f70fde383a (diff) | |
| download | forums-aaa9a4b0e629d6109e6d92ac0ee79298594da204.tar forums-aaa9a4b0e629d6109e6d92ac0ee79298594da204.tar.gz forums-aaa9a4b0e629d6109e6d92ac0ee79298594da204.tar.bz2 forums-aaa9a4b0e629d6109e6d92ac0ee79298594da204.tar.xz forums-aaa9a4b0e629d6109e6d92ac0ee79298594da204.zip | |
Merge branch 'develop-ascraeus' into develop
# By Tristan Darricau
# Via Dhruv Goel (1) and Tristan Darricau (1)
* develop-ascraeus:
[ticket/12109] Fix coding style
[ticket/12109] Bug when setting permissions with "Select all users"
| -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)) { |