diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-29 14:52:43 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-04-29 14:52:43 +0000 |
| commit | 66a9d467ced3242c8be4601afd3b93bd4e76316b (patch) | |
| tree | 3e83497961571d3130ce1763a07dceceb57b8ab5 | |
| parent | dd80961b1177b64999956193f5d0cc0b7249c4f2 (diff) | |
| download | forums-66a9d467ced3242c8be4601afd3b93bd4e76316b.tar forums-66a9d467ced3242c8be4601afd3b93bd4e76316b.tar.gz forums-66a9d467ced3242c8be4601afd3b93bd4e76316b.tar.bz2 forums-66a9d467ced3242c8be4601afd3b93bd4e76316b.tar.xz forums-66a9d467ced3242c8be4601afd3b93bd4e76316b.zip | |
only pre-fill forums if in forum mode (else it is too irritating to see the forum select skipped on user/group selection screens)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9496 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/includes/acp/acp_permissions.php | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_permissions.php b/phpBB/includes/acp/acp_permissions.php index dcf524d64c..164970b5d5 100644 --- a/phpBB/includes/acp/acp_permissions.php +++ b/phpBB/includes/acp/acp_permissions.php @@ -762,7 +762,14 @@ class acp_permissions $this->log_action($mode, 'add', $permission_type, $ug_type, $ug_ids, $forum_ids); - trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&forum_id[]=' . implode('&forum_id[]=', $forum_ids))); + if ($mode == 'setting_forum_local' || $mode == 'setting_mod_local') + { + trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&forum_id[]=' . implode('&forum_id[]=', $forum_ids))); + } + else + { + trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); + } } /** @@ -829,7 +836,14 @@ class acp_permissions $this->log_action($mode, 'del', $permission_type, $ug_type, (($ug_type == 'user') ? $user_id : $group_id), (sizeof($forum_id) ? $forum_id : array(0 => 0))); - trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&forum_id[]=' . implode('&forum_id[]=', $forum_id))); + if ($mode == 'setting_forum_local' || $mode == 'setting_mod_local') + { + trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action . '&forum_id[]=' . implode('&forum_id[]=', $forum_id))); + } + else + { + trigger_error($user->lang['AUTH_UPDATED'] . adm_back_link($this->u_action)); + } } /** |