summaryrefslogtreecommitdiffstats
path: root/editgroups.cgi
diff options
context:
space:
mode:
authorlpsolit%gmail.com <>2006-01-23 05:10:08 +0100
committerlpsolit%gmail.com <>2006-01-23 05:10:08 +0100
commit501cc533070b8c4366ae0d59e40a166a5f9452dc (patch)
treeeb79665f994c69aa84ebb3005776b0ad0c6c04d2 /editgroups.cgi
parentc856f1ec2e30c85527965b7f1384fd9386fbcb86 (diff)
downloadbugzilla-501cc533070b8c4366ae0d59e40a166a5f9452dc.tar.gz
bugzilla-501cc533070b8c4366ae0d59e40a166a5f9452dc.tar.xz
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
Diffstat (limited to 'editgroups.cgi')
-rwxr-xr-xeditgroups.cgi5
1 files changed, 3 insertions, 2 deletions
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 = ?',