diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-11-22 19:38:25 +0000 |
| commit | d46e8e6f98054fc58a126c865184369198d9a2ed (patch) | |
| tree | f84899714e91ff360dcf16122d0ef723f5cefa15 /phpBB/includes/acp/acp_groups.php | |
| parent | 47b4b8346813312f99509d3f9d877c9cbf81b88b (diff) | |
| download | forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.gz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.bz2 forums-d46e8e6f98054fc58a126c865184369198d9a2ed.tar.xz forums-d46e8e6f98054fc58a126c865184369198d9a2ed.zip | |
merge revisions i missed... hopefully not breaking things - did not check every change.
git-svn-id: file:///svn/phpbb/trunk@9077 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index 1680dacfda..cae2c30433 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -87,7 +87,7 @@ class acp_groups // Approve, demote or promote $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; $error = group_user_attributes($action, $group_id, $mark_ary, false, $group_name); - + if (!$error) { switch ($action) @@ -111,7 +111,7 @@ class acp_groups { trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&action=list&g=' . $group_id), E_USER_WARNING); } - + break; case 'default': @@ -179,7 +179,7 @@ class acp_groups case 'deleteusers': case 'delete': - if (!$group_id) + if (!$group_id) { trigger_error($user->lang['NO_GROUP'] . adm_back_link($this->u_action), E_USER_WARNING); } @@ -187,6 +187,7 @@ class acp_groups { trigger_error($user->lang['NO_AUTH_OPERATION'] . adm_back_link($this->u_action), E_USER_WARNING); } + if (confirm_box(true)) { $error = ''; @@ -751,14 +752,14 @@ class acp_groups foreach ($row_ary as $group_id => $row) { $group_name = (!empty($user->lang['G_' . $row['group_name']]))? $user->lang['G_' . $row['group_name']] : $row['group_name']; - + $template->assign_block_vars('groups', array( 'U_LIST' => "{$this->u_action}&action=list&g=$group_id", 'U_EDIT' => "{$this->u_action}&action=edit&g=$group_id", 'U_DELETE' => ($auth->acl_get('a_groupdel')) ? "{$this->u_action}&action=delete&g=$group_id" : '', 'S_GROUP_SPECIAL' => ($row['group_type'] == GROUP_SPECIAL) ? true : false, - + 'GROUP_NAME' => $group_name, 'TOTAL_MEMBERS' => $row['total_members'], ) |