diff options
author | Dave Lawrence <dlawrence@mozilla.com> | 2013-09-18 17:08:32 +0200 |
---|---|---|
committer | Dave Lawrence <dlawrence@mozilla.com> | 2013-09-18 17:08:32 +0200 |
commit | 2799e118d748aa32aa496c6614ba369dbd169520 (patch) | |
tree | b5d700400dab5625acea6186f35feffd6269dd26 /Bugzilla/WebService | |
parent | 4ab99774da63f0d3573d7b56887937cdbbe0a2ff (diff) | |
download | bugzilla-2799e118d748aa32aa496c6614ba369dbd169520.tar.gz bugzilla-2799e118d748aa32aa496c6614ba369dbd169520.tar.xz |
Bug 916979 - Bug.search ignores the "limit" parameter
a/r=glob
Diffstat (limited to 'Bugzilla/WebService')
-rw-r--r-- | Bugzilla/WebService/Bug.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Bugzilla/WebService/Bug.pm b/Bugzilla/WebService/Bug.pm index fd8ea8fef..14d56713c 100644 --- a/Bugzilla/WebService/Bug.pm +++ b/Bugzilla/WebService/Bug.pm @@ -493,19 +493,19 @@ sub search { } my %match_params = %{ $params }; - delete $params->{include_fields}; - delete $params->{exclude_fields}; + delete $match_params{include_fields}; + delete $match_params{exclude_fields}; # If no other parameters have been passed other than limit and offset # then we throw error if system is configured to do so. - if (!grep(!/^(limit|offset)$/i, keys %$params) + if (!grep(!/^(limit|offset)$/, keys %match_params) && !Bugzilla->params->{search_allow_no_criteria}) { ThrowUserError('buglist_parameters_required'); } - $options{order_columns} = [ split(/\s*,\s*/, delete $params->{order}) ] if $params->{order}; - $options{params} = $params; + $options{order_columns} = [ split(/\s*,\s*/, delete $match_params{order}) ] if $match_params{order}; + $options{params} = \%match_params; my $search = new Bugzilla::Search(%options); my ($data) = $search->data; @@ -518,7 +518,7 @@ sub search { my @bug_ids = map { $_->[0] } @$data; my $bug_objects = Bugzilla::Bug->new_from_list(\@bug_ids); - my @bugs = map { $self->_bug_to_hash($_, \%match_params) } @$bug_objects; + my @bugs = map { $self->_bug_to_hash($_, $params) } @$bug_objects; return { bugs => \@bugs }; } |