summaryrefslogtreecommitdiffstats
path: root/Bugzilla/WebService
diff options
context:
space:
mode:
authorDavid Lawrence <dkl@redhat.com>2014-06-18 17:30:34 +0200
committerDavid Lawrence <dkl@redhat.com>2014-06-18 17:30:34 +0200
commitd596739c558b305e07dc9d885fcca3a103bfbd67 (patch)
tree4e6f39fa83ea922cab472190b480fc998e044d81 /Bugzilla/WebService
parent944b3270eebfc3a419c8917406d0754d8e92d0bb (diff)
downloadbugzilla-d596739c558b305e07dc9d885fcca3a103bfbd67.tar.gz
bugzilla-d596739c558b305e07dc9d885fcca3a103bfbd67.tar.xz
Bug 1026726: filter_wants should be updated to allow exclude_fields higher precedence over include_fields=_all
r=glob,a=glob
Diffstat (limited to 'Bugzilla/WebService')
-rw-r--r--Bugzilla/WebService/Util.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index bba6122e5..26558fc6a 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) {