Merge branch '3.0/search-query-tweak' into 3.0.0-releng

html/RTIR/Search/Elements/ShowResults

@@ -47,7 +47,12 @@
 %# END BPS TAGGED BLOCK }}}
 <%INIT>
 
-$Query = join ' AND ', map "( $_ )", grep $_, $BaseQuery, $Query;
+if ( $BaseQuery && $Query ) {
+    $Query = join ' AND ', map "( $_ )", $BaseQuery, $Query;
+}
+else {
+    $Query ||= $BaseQuery;
+}
 
 $BaseURL = RT->Config->Get('WebPath')."/$BaseURL" unless $BaseURL =~ m{^/};
 $BaseURL .= ( $BaseURL =~ /\?/ )? '&': '?' unless $BaseURL =~ m{[&?]$};

html/RTIR/Search/Reporting.html

@@ -71,7 +71,14 @@
 <%INIT>
 my $title = loc('Reporting');
 
-my $FullQuery = join ' AND ', map "( $_ )", grep $_, $BaseQuery, $Query;
+my $FullQuery;
+
+if ( $BaseQuery && $Query ) {
+    $FullQuery = join ' AND ', map "( $_ )", $BaseQuery, $Query;
+}
+else {
+    $FullQuery = $BaseQuery || $Query;
+}
 
 </%INIT>
 

html/RTIR/Search/Results.html

@@ -82,8 +82,12 @@ RT::IR::Config::CheckObsoleteCFSyntax($Format,$location);
 RT::IR::Config::CheckObsoleteCFSyntax($Query,$location);
 
 if ( $Type ) {
-    $BaseQuery ||= RT::IR->Query( Queue => $Queue );
-    $Query     ||= RT::IR->ActiveQuery( Queue => $Queue );
+    if ( $Query ) {
+        $BaseQuery ||= RT::IR->Query( Queue => $Queue );
+    }
+    else {
+        $Query = RT::IR->ActiveQuery( Queue => $Queue );
+    }
 }
 
 my $BaseURL = "RTIR/Search/Results.html";