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

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

Bug 324248: Deleting a group doesn't remove entries in group_group_map correctly…
501cc533 · lpsolit%gmail.com · c856f1ec · 501cc533
Commit 501cc533 authored Jan 23, 2006 by lpsolit%gmail.com
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

editgroups.cgi editgroups.cgi +3 -2

No files found.
--- 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 = ?',