mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-05 00:25:27 +00:00
Bug 345359: Prevent Flag::clear from deleting a deleted flag when checking the inclusion and exclusion lists - Patch by Fr�d�ric Buclin <LpSolit@gmail.com> a=myk
This commit is contained in:
parent
fb11841028
commit
faeb3d399a
@ -448,7 +448,7 @@ sub process {
|
||||
# In case the bug's product/component has changed, clear flags that are
|
||||
# no longer valid.
|
||||
my $flag_ids = $dbh->selectcol_arrayref(
|
||||
"SELECT flags.id
|
||||
"SELECT DISTINCT flags.id
|
||||
FROM flags
|
||||
INNER JOIN bugs
|
||||
ON flags.bug_id = bugs.bug_id
|
||||
@ -463,7 +463,7 @@ sub process {
|
||||
foreach my $flag_id (@$flag_ids) { clear($flag_id, $bug, $attachment) }
|
||||
|
||||
$flag_ids = $dbh->selectcol_arrayref(
|
||||
"SELECT flags.id
|
||||
"SELECT DISTINCT flags.id
|
||||
FROM flags, bugs, flagexclusions e
|
||||
WHERE bugs.bug_id = ?
|
||||
AND flags.bug_id = bugs.bug_id
|
||||
|
@ -388,7 +388,8 @@ sub update {
|
||||
|
||||
# Clear existing flags for bugs/attachments in categories no longer on
|
||||
# the list of inclusions or that have been added to the list of exclusions.
|
||||
my $flags = $dbh->selectall_arrayref('SELECT flags.id, flags.bug_id, flags.attach_id
|
||||
my $flags = $dbh->selectall_arrayref('SELECT DISTINCT flags.id, flags.bug_id,
|
||||
flags.attach_id
|
||||
FROM flags
|
||||
INNER JOIN bugs
|
||||
ON flags.bug_id = bugs.bug_id
|
||||
@ -408,7 +409,7 @@ sub update {
|
||||
Bugzilla::Flag::clear($flag_id, $bug, $attachment);
|
||||
}
|
||||
|
||||
$flags = $dbh->selectall_arrayref('SELECT flags.id, flags.bug_id, flags.attach_id
|
||||
$flags = $dbh->selectall_arrayref('SELECT DISTINCT flags.id, flags.bug_id, flags.attach_id
|
||||
FROM flags
|
||||
INNER JOIN bugs
|
||||
ON flags.bug_id = bugs.bug_id
|
||||
|
Loading…
Reference in New Issue
Block a user