From ac85576a8799ec12036bfb8bb93ac48f96830f1f Mon Sep 17 00:00:00 2001
From: Dylan William Hardison <dylan@hardison.net>
Date: Mon, 13 Mar 2017 19:23:22 -0400
Subject: Revert "Bug 1307485 - Add code to run a subset of buglist.cgi search
 queries against the ES backend"

This reverts commit 9c26c01867ca3e2af1e70c051140eea59c68c500.
---
 Bugzilla/Search/Quicksearch.pm | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'Bugzilla/Search')

diff --git a/Bugzilla/Search/Quicksearch.pm b/Bugzilla/Search/Quicksearch.pm
index 462a9ba85..4f11a3f54 100644
--- a/Bugzilla/Search/Quicksearch.pm
+++ b/Bugzilla/Search/Quicksearch.pm
@@ -127,7 +127,7 @@ use constant COMPONENT_EXCEPTIONS => (
 );
 
 # Quicksearch-wide globals for boolean charts.
-our ($chart, $and, $or, $fulltext, $bug_status_set, $ELASTIC);
+our ($chart, $and, $or, $fulltext, $bug_status_set);
 
 sub quicksearch {
     my ($searchstring) = (@_);
@@ -587,8 +587,7 @@ sub _default_quicksearch_word {
     addChart('alias', 'substring', $word, $negate);
     addChart('short_desc', 'substring', $word, $negate);
     addChart('status_whiteboard', 'substring', $word, $negate);
-    addChart('longdesc', 'substring', $word, $negate) if $ELASTIC;
-    addChart('content', 'matches', _matches_phrase($word), $negate) if $fulltext && !$ELASTIC;
+    addChart('content', 'matches', _matches_phrase($word), $negate) if $fulltext;
 
     # BMO Bug 664124 - Include the crash signature (sig:) field in default quicksearches
     addChart('cf_crash_signature',  'substring',  $word,  $negate);
@@ -618,7 +617,6 @@ sub _handle_urls {
 # Quote and escape a phrase appropriately for a "content matches" search.
 sub _matches_phrase {
     my ($phrase) = @_;
-    return $phrase if $ELASTIC;
     $phrase =~ s/"/\\"/g;
     return "\"$phrase\"";
 }
-- 
cgit v1.2.3-24-g4f1b