Bug 150882 - SQL error when sorting by bugs.votes with explicit direction

r=gerv x2

diff --git a/buglist.cgi b/buglist.cgi
index 4656fc42a1a5599842cfc924496669f4fdf097d5..d64244d84dc2338cba08fe9d311339451c451c82 100755 (executable)
--- a/buglist.cgi
+++ b/buglist.cgi
@@ -1364,10 +1364,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 ";
 }