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

Bug 434062: Attachment flags can only be set once per bug (regression) - Patch by FrÃ©dÃ©ric Buclin <LpSolit@gmail.com> a=LpSolit (module owner)

Bug 434062: Attachment flags can only be set once per bug (regression) - Patch…
a60171ca · lpsolit%gmail.com · 2ee97093 · a60171ca
Commit a60171ca authored May 17, 2008 by lpsolit%gmail.com
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Flag.pm Bugzilla/Flag.pm +4 -4

No files found.
--- 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.