aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2008-11-09 15:05:35 +0000
committerHenry Sudhof <kellanved@phpbb.com>2008-11-09 15:05:35 +0000
commitf4e99123f852ce0aad6d9a8c5b12b6910af9f6d3 (patch)
treec13a60491e5736198ae87dc06c0228ea71bbe37c /phpBB/includes/acp/acp_groups.php
parent9268c8e26ac1729ba7eb17a2454df2d4c3565a6e (diff)
downloadforums-f4e99123f852ce0aad6d9a8c5b12b6910af9f6d3.tar
forums-f4e99123f852ce0aad6d9a8c5b12b6910af9f6d3.tar.gz
forums-f4e99123f852ce0aad6d9a8c5b12b6910af9f6d3.tar.bz2
forums-f4e99123f852ce0aad6d9a8c5b12b6910af9f6d3.tar.xz
forums-f4e99123f852ce0aad6d9a8c5b12b6910af9f6d3.zip
#36525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9052 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php22
1 files changed, 8 insertions, 14 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index adc6487a8d..d242bbcdc9 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -180,13 +180,16 @@ class acp_groups
case 'deleteusers':
case 'delete':
+ if (!$group_id)
+ {
+ trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
+ else if ($action === 'delete' && $group_row['group_type'] == GROUP_SPECIAL)
+ {
+ trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
+ }
if (confirm_box(true))
{
- if (!$group_id)
- {
- trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
- }
-
$error = '';
switch ($action)
@@ -218,15 +221,6 @@ class acp_groups
}
else
{
- if (!$group_id)
- {
- trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING);
- }
- else if ($action === 'delete' && $group_row['group_type'] == GROUP_SPECIAL)
- {
- trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING);
- }
-
confirm_box(false, $user->lang['CONFIRM_OPERATION'], build_hidden_fields(array(
'mark' => $mark_ary,
'g' => $group_id,