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

diff --git a/editgroups.cgi b/editgroups.cgi
index 617260230ac259b8e41fe1ca1eb653931324c894..c366c6d798f04c0d3045a1c39c27cc2799c0beb5 100755 (executable)
--- 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 = ?',