Bug 434062: Attachment flags can only be set once per bug (regression) - Patch by...

diff --git a/Bugzilla/Flag.pm b/Bugzilla/Flag.pm
index a65a8268b1f5404ce11ef339e2378fac029da15b..6266b0c0cc1d8957de3f92c425aeb069f71ca61c 100644 (file)
--- a/Bugzilla/Flag.pm
+++ b/Bugzilla/Flag.pm
@@ -228,12 +228,12 @@ sub match {
     # If the caller specified only bug or attachment flags,
     # limit the query to those kinds of flags.
     if (my $type = delete $criteria->{'target_type'}) {
-        if ($type eq 'attachment') {
-            $criteria->{'attach_id'} = NOT_NULL;
-        }
-        else {
+        if ($type eq 'bug') {
             $criteria->{'attach_id'} = IS_NULL;
         }
+        elsif (!defined $criteria->{'attach_id'}) {
+            $criteria->{'attach_id'} = NOT_NULL;
+        }
     }
     # Flag->snapshot() calls Flag->match() with bug_id and attach_id
     # as hash keys, even if attach_id is undefined.