From: bbaetz%student.usyd.edu.au <>
Date: Thu, 13 Jun 2002 06:18:58 +0000 (+0000)
Subject: Bug 150882 - SQL error when sorting by bugs.votes with explicit direction
X-Git-Tag: bugzilla-2.17.1~314
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d02f8a4d2134881785974afb29c7328aafd40fe8;p=thirdparty%2Fbugzilla.git

Bug 150882 - SQL error when sorting by bugs.votes with explicit direction
r=gerv x2
---

diff --git a/buglist.cgi b/buglist.cgi
index 925f0296f9..b649b8f1e1 100755
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -1357,10 +1357,9 @@ if ($order) {
         $query =~ s/\sWHERE\s/ LEFT JOIN milestones ms_order ON ms_order.value = bugs.target_milestone AND ms_order.product = bugs.product WHERE /;
     }
 
-    # If we are sorting by votes, sort in descending order.
-    if ($db_order =~ /bugs.votes\s*(asc|desc){0}/i) {
-        $db_order =~ s/bugs.votes/bugs.votes desc/i;
-    }
+    # If we are sorting by votes, sort in descending order if no explicit
+    # sort order was given
+    $db_order =~ s/bugs.votes\s*(,|$)/bugs.votes desc$1/i;
 
     $query .= " ORDER BY $db_order ";
 }