aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_groups.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-11-18 16:27:35 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-11-18 16:27:35 +0000
commite264a62b731d29389ba0a4a3548070e259e373c0 (patch)
tree8b4c935deb992a577cedd8123a46b2fcaf128d6d /phpBB/includes/acp/acp_groups.php
parent5f788b4d08838dec5e8168f2efd515859224a3a4 (diff)
downloadforums-e264a62b731d29389ba0a4a3548070e259e373c0.tar
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.gz
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.bz2
forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.xz
forums-e264a62b731d29389ba0a4a3548070e259e373c0.zip
- a handful of mcp fixed, the most important one is the change for check_ids() - it is now supporting ids from more than one forum too, making it possible to use some mcp features as designed initially. We really need to get our moderator team testing the mcp extensively.
- fixed some other tiny glitches - if a forum category with subforums get changed to a link type forum give options of what to do with the subforums (#5334) - other bugfixes git-svn-id: file:///svn/phpbb/trunk@6601 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
-rw-r--r--phpBB/includes/acp/acp_groups.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php
index 9df1c52d65..fb58c33897 100644
--- a/phpBB/includes/acp/acp_groups.php
+++ b/phpBB/includes/acp/acp_groups.php
@@ -214,9 +214,10 @@ class acp_groups
}
$name_ary = array_unique(explode("\n", $name_ary));
+ $group_name = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name'];
// Add user/s to group
- if ($error = group_user_add($group_id, false, $name_ary, $group_row['group_name'], $default, $leader, 0, $group_row))
+ if ($error = group_user_add($group_id, false, $name_ary, $group_name, $default, $leader, 0, $group_row))
{
trigger_error($user->lang[$error] . adm_back_link($this->u_action . '&amp;action=list&amp;g=' . $group_id), E_USER_WARNING);
}