diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-11-13 11:46:49 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-11-13 11:46:49 +0000 |
| commit | 1739da933574ff2cd68120d7c6ac0dae914943a6 (patch) | |
| tree | a88fca88ff080c343acbd72887920ee3794345f9 /phpBB/includes | |
| parent | 36635929a84f21ae76c0515d59ccfe942d847b4c (diff) | |
| download | forums-1739da933574ff2cd68120d7c6ac0dae914943a6.tar forums-1739da933574ff2cd68120d7c6ac0dae914943a6.tar.gz forums-1739da933574ff2cd68120d7c6ac0dae914943a6.tar.bz2 forums-1739da933574ff2cd68120d7c6ac0dae914943a6.tar.xz forums-1739da933574ff2cd68120d7c6ac0dae914943a6.zip | |
Merging R9051 and R 9052
git-svn-id: file:///svn/phpbb/trunk@9062 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 279fb7f56d..1680dacfda 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -179,13 +179,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) |