Commit d596739c authored by David Lawrence's avatar David Lawrence

Bug 1026726: filter_wants should be updated to allow exclude_fields higher…

Bug 1026726: filter_wants should be updated to allow exclude_fields higher precedence over include_fields=_all r=glob,a=glob
parent 944b3270
...@@ -154,14 +154,14 @@ sub filter_wants($$;$$) { ...@@ -154,14 +154,14 @@ sub filter_wants($$;$$) {
delete $exclude{$key}; 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 # Explicit inclusion/exclusion
return $cache->{$field} = 0 if $exclude{$field}; return $cache->{$field} = 0 if $exclude{$field};
return $cache->{$field} = 1 if $include{$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 # 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) # for one or more of the field's types (and not excluded them)
foreach my $type (keys %field_types) { foreach my $type (keys %field_types) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment