From 501cc533070b8c4366ae0d59e40a166a5f9452dc Mon Sep 17 00:00:00 2001
From: "lpsolit%gmail.com" <>
Date: Mon, 23 Jan 2006 04:10:08 +0000
Subject: =?UTF-8?q?Bug=20324248:=20Deleting=20a=20group=20doesn't=20remove?=
 =?UTF-8?q?=20entries=20in=20group=5Fgroup=5Fmap=20correctly=20-=20Patch?=
 =?UTF-8?q?=20by=20Fr=C3=A9d=C3=A9ric=20Buclin=20<LpSolit@gmail.com>=20r?=
 =?UTF-8?q?=3Djoel=20a=3Djustdave?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 editgroups.cgi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'editgroups.cgi')

diff --git a/editgroups.cgi b/editgroups.cgi
index 617260230..c366c6d79 100755
--- a/editgroups.cgi
+++ b/editgroups.cgi
@@ -435,8 +435,9 @@ if ($action eq 'delete') {
                   undef, (undef, $gid));
         $dbh->do('DELETE FROM user_group_map WHERE group_id = ?',
                   undef, $gid);
-        $dbh->do('DELETE FROM group_group_map WHERE grantor_id = ?',
-                  undef, $gid);
+        $dbh->do('DELETE FROM group_group_map 
+                   WHERE grantor_id = ? OR member_id = ?',
+                  undef, ($gid, $gid));
         $dbh->do('DELETE FROM bug_group_map WHERE group_id = ?',
                   undef, $gid);
         $dbh->do('DELETE FROM group_control_map WHERE group_id = ?',
-- 
cgit v1.2.1