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 4b0260137f0aeb8b508e79001a995df6bbc2c9d5..5c9d37d9a0bcb4245bf23b5937643e34049dec5a 100644 (file)
--- 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"};