From: lpsolit%gmail.com <>
Date: Mon, 23 Jan 2006 04:12:20 +0000 (+0000)
Subject: Bug 324248: Deleting a group doesn't remove entries in group_group_map correctly... 
X-Git-Tag: bugzilla-2.20.1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f9ee9eb4cddbbbfc9b6223a78333f72403ab6b5;p=thirdparty%2Fbugzilla.git

Bug 324248: Deleting a group doesn't remove entries in group_group_map correctly - Patch by Frédéric Buclin <LpSolit@gmail.com> r=joel a=justdave
---

diff --git a/editgroups.cgi b/editgroups.cgi
index 8efef693b3..bc7806df4a 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -454,7 +454,8 @@ if ($action eq 'delete') {
         SendSQL("UPDATE flagtypes SET request_group_id = NULL 
                  WHERE request_group_id = $gid");
         SendSQL("DELETE FROM user_group_map WHERE group_id = $gid");
-        SendSQL("DELETE FROM group_group_map WHERE grantor_id = $gid");
+        SendSQL("DELETE FROM group_group_map
+                 WHERE grantor_id = $gid OR member_id = $gid");
         SendSQL("DELETE FROM bug_group_map WHERE group_id = $gid");
         SendSQL("DELETE FROM group_control_map WHERE group_id = $gid");
         SendSQL("DELETE FROM whine_schedules WHERE " .