From: Eric Wong <e@80x24.org>
Date: Thu, 20 Aug 2015 02:30:31 +0000 (+0000)
Subject: search: reject ghosts in all cases
X-Git-Tag: v1.0.0~1032
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=279afe6a508647d3fca8e8d22ee719fd6940422c;p=public-inbox.git

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 aa29ae53..0e63ee35 100644
--- 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 ||= {};