From: lpsolit%gmail.com <>
Date: Mon, 23 Jan 2006 04:10:08 +0000 (+0000)
Subject: Bug 324248: Deleting a group doesn't remove entries in group_group_map correctly... 
X-Git-Tag: bugzilla-2.22rc1~22
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=501cc533070b8c4366ae0d59e40a166a5f9452dc;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 617260230a..c366c6d798 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 = ?',