From 8ab0d6713284ae54953b389ddeb9691a32d756d0 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Wed, 9 Sep 2015 12:05:01 +0800
Subject: Bug 1202147 - Performing a Simple Search results in the message
 "invalid column names: relevance desc"

---
 buglist.cgi | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'buglist.cgi')

diff --git a/buglist.cgi b/buglist.cgi
index 055de388d..18a9a7fc2 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -717,15 +717,6 @@ my $search = new Bugzilla::Search('fields' => \@selectcolumns,
 
 $order = join(',', $search->order);
 
-if (scalar @{$search->invalid_order_columns}) {
-    $vars->{'message'} = 'invalid_column_name';
-    $vars->{'invalid_fragments'} = $search->invalid_order_columns;
-}
-
-if ($fulltext and grep { /^relevance/ } $search->order) {
-    $vars->{'message'} = 'buglist_sorted_by_relevance'
-}
-
 # We don't want saved searches and other buglist things to save
 # our default limit.
 $params->delete('limit') if $vars->{'default_limited'};
@@ -789,6 +780,15 @@ if ($cgi->param('debug')
     }
 }
 
+if (scalar @{$search->invalid_order_columns}) {
+    $vars->{'message'} = 'invalid_column_name';
+    $vars->{'invalid_fragments'} = $search->invalid_order_columns;
+}
+
+if ($fulltext and grep { /^relevance/ } $search->order) {
+    $vars->{'message'} = 'buglist_sorted_by_relevance'
+}
+
 ################################################################################
 # Results Retrieval
 ################################################################################
-- 
cgit v1.2.3-24-g4f1b