From: Max Kanat-Alexander Date: Fri, 13 May 2011 20:39:44 +0000 (-0700) Subject: Allow searches to specify whether the top-level criteria will be joined X-Git-Tag: bugzilla-4.1.3~80 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a8c38773194820956e91b18735beb59e50a2686c;p=thirdparty%2Fbugzilla.git Allow searches to specify whether the top-level criteria will be joined together with AND or OR. (This is part of bug 647649 but fixes a test failure caused by bug 656994 so is being checked in now.) --- diff --git a/Bugzilla/Search.pm b/Bugzilla/Search.pm index 4b0260137f..5c9d37d9a0 100644 --- a/Bugzilla/Search.pm +++ b/Bugzilla/Search.pm @@ -1555,7 +1555,7 @@ sub _custom_search { my @field_ids = map { /(\d+)/; $1 } @field_params; @field_ids = sort { $a <=> $b } @field_ids; - my $current_clause = new Bugzilla::Search::Clause(); + my $current_clause = new Bugzilla::Search::Clause($params->{j_top}); my @clause_stack; foreach my $id (@field_ids) { my $field = $params->{"f$id"};