aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-02 15:24:55 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-02 15:24:55 +0000
commite9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a (patch)
tree8d2fe110a9af4b52f5766c0a64d77e35bb8b1ec9 /phpBB/includes
parent2e5e0a7868b246427943feb096a383ccc355a344 (diff)
downloadforums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.gz
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.bz2
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.tar.xz
forums-e9e9e8e69c3aee47d5bfbc24b2fb9f335cddf36a.zip
merge revisions: #r8359, #r8360, #r8368
git-svn-id: file:///svn/phpbb/trunk@8369 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_groups.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php
index a4fc818343..d6e7a30176 100644
--- a/phpBB/includes/ucp/ucp_groups.php
+++ b/phpBB/includes/ucp/ucp_groups.php
@@ -127,6 +127,18 @@ class ucp_groups
}
list(, $row) = each($row);
+ $sql = 'SELECT group_type
+ FROM ' . GROUPS_TABLE . '
+ WHERE group_id = ' . $group_id;
+ $result = $db->sql_query($sql);
+ $group_type = (int) $db->sql_fetchfield('group_type');
+ $db->sql_freeresult($result);
+
+ if ($group_type != GROUP_OPEN && $group_type != GROUP_FREE)
+ {
+ trigger_error($user->lang['CANNOT_RESIGN_GROUP'] . $return_page);
+ }
+
if (confirm_box(true))
{
group_user_del($group_id, $user->data['user_id']);