From: David Lawrence <dkl@redhat.com>
Date: Wed, 18 Jun 2014 15:30:34 +0000 (+0000)
Subject: Bug 1026726: filter_wants should be updated to allow exclude_fields higher precedence... 
X-Git-Tag: bugzilla-4.5.5~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d596739c558b305e07dc9d885fcca3a103bfbd67;p=thirdparty%2Fbugzilla.git

Bug 1026726: filter_wants should be updated to allow exclude_fields higher precedence over include_fields=_all
r=glob,a=glob
---

diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index bba6122e59..26558fc6ac 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -154,14 +154,14 @@ sub filter_wants($$;$$) {
         delete $exclude{$key};
     }
 
-    # If the user has asked to include all or exclude all
-    return $cache->{$field} = 0 if $exclude_types{'all'};
-    return $cache->{$field} = 1 if $include_types{'all'};
-
     # Explicit inclusion/exclusion
     return $cache->{$field} = 0 if $exclude{$field};
     return $cache->{$field} = 1 if $include{$field};
 
+    # If the user has asked to include all or exclude all
+    return $cache->{$field} = 0 if $exclude_types{'all'};
+    return $cache->{$field} = 1 if $include_types{'all'};
+
     # If the user has not asked for any fields specifically or if the user has asked
     # for one or more of the field's types (and not excluded them)
     foreach my $type (keys %field_types) {