1 files changed, 13 insertions, 4 deletions
diff --git a/Bugzilla/WebService/Util.pm b/Bugzilla/WebService/Util.pm
index 9e20a1e06..d2a8de85c 100644
--- a/Bugzilla/WebService/Util.pm
+++ b/Bugzilla/WebService/Util.pm
@@ -43,11 +43,20 @@ sub filter_wants ($$;$) {
 
     $field = "${prefix}.${field}" if $prefix;
 
-    if (defined $params->{include_fields}) {
-        return 0 if !$include{$field};
+    if (defined $params->{exclude_fields} && $exclude{$field}) {
+        return 0;
     }
-    if (defined $params->{exclude_fields}) {
-        return 0 if $exclude{$field};
+    if (defined $params->{include_fields} && !$include{$field}) {
+        if ($prefix) {
+            # Include the field if the parent is include (and this one is not excluded)
+            return 0 if !$include{$prefix};
+        }
+        else {
+            # We want to include this if one of the sub keys is included
+            my $key = $field . '.';
+            my $len = length($key);
+            return 0 if ! grep { substr($_, 0, $len) eq $key  } keys %include;
+        }
     }
 
     return 1;