search: reject ghosts in all cases

We do not need ghost messages in any of our thread views

diff --git a/lib/PublicInbox/Search.pm b/lib/PublicInbox/Search.pm
index aa29ae53332784d367def79910011b1098c758b2..0e63ee35b4143f6f83af20821fa16df52ab209db 100644 (file)
--- a/lib/PublicInbox/Search.pm
+++ b/lib/PublicInbox/Search.pm
@@ -214,7 +214,6 @@ sub query {
        my ($self, $query_string, $opts) = @_;
        my $query = $self->qp->parse_query($query_string, QP_FLAGS);
 
-       $query = Search::Xapian::Query->new(OP_AND, $mail_query, $query);
        $self->do_enquire($query, $opts);
 }
 
@@ -255,6 +254,7 @@ sub do_enquire {
        my ($self, $query, $opts) = @_;
        my $enquire = $self->enquire;
 
+       $query = Search::Xapian::Query->new(OP_AND, $query, $mail_query);
        $enquire->set_query($query);
        $enquire->set_sort_by_relevance_then_value(TS, 0);
        $opts ||= {};