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

1 files changed, 3 insertions, 2 deletions

diff --git a/editflagtypes.cgi b/editflagtypes.cgi
index 79bf0dd72..1ca6bd94d 100755
--- a/editflagtypes.cgi
+++ b/editflagtypes.cgi
@@ -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