diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-01 16:09:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-07-01 16:09:50 +0000 |
| commit | 6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2 (patch) | |
| tree | 9a369d5bda1449ab2218979181bcf219096c52ac /phpBB/includes | |
| parent | 817a82a1afb86a1761c5c6a810ed9b8f599c147a (diff) | |
| download | forums-6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2.tar forums-6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2.tar.gz forums-6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2.tar.bz2 forums-6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2.tar.xz forums-6ca11b2d2b7a9e6420eec3b21e1531c1586c15c2.zip | |
some fixes... most importantly the ability to update the board with the automatic files while having fsockopen disabled (instead, the update file information will be used, which may be inaccurate if the admin did a mistake).
git-svn-id: file:///svn/phpbb/trunk@7818 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index d926801b2f..d517ca2d1b 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -812,7 +812,7 @@ class ucp_groups $user->add_lang('acp/groups'); // Approve, demote or promote - group_user_attributes('approve', $group_id, $mark_ary, false, ($group_id) ? $group_row['group_name'] : false); + group_user_attributes('approve', $group_id, $mark_ary, false, false); trigger_error($user->lang['USERS_APPROVED'] . '<br /><br />' . sprintf($user->lang['RETURN_PAGE'], '<a href="' . $this->u_action . '&action=list&g=' . $group_id . '">', '</a>')); @@ -836,6 +836,8 @@ class ucp_groups trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); } + $group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; + if (confirm_box(true)) { if (!sizeof($mark_ary)) @@ -910,6 +912,8 @@ class ucp_groups trigger_error($user->lang['NOT_LEADER_OF_GROUP'] . $return_page); } + $group_row['group_name'] = ($group_row['group_type'] == GROUP_SPECIAL) ? $user->lang['G_' . $group_row['group_name']] : $group_row['group_name']; + if (confirm_box(true)) { if (!$group_id) |