Bug 324248: Deleting a group doesn't remove entries in group_group_map correctly...

diff --git a/editgroups.cgi b/editgroups.cgi
index 8efef693b31802ac018325e99db1e1e0a91c66ad..bc7806df4a6cdc967efc69ad15c6fe54441ebb31 100755 (executable)
--- 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 " .