1 files changed, 7 insertions, 12 deletions

diff --git a/packages/index.php b/packages/index.php
index 4d854a9..35f0d26 100644
--- a/packages/index.php
+++ b/packages/index.php
@@ -129,19 +129,11 @@ require_once BASE . "/lib/format.php";
     false
   );
 
-  $q_f = $extra_joins . $filter . $fuzzy_filter . " ORDER BY ";
-
-  if (array_key_exists("sort", $_GET)) {
-    if (isset($pkglist_sorts[$_GET["sort"]]["mysql"]))
-      $q_f .= $pkglist_sorts[$_GET["sort"]]["mysql"] . ",";
-    elseif (isset($pkglist_sorts[substr($_GET["sort"],1)]["mysql"]))
-      $q_f .= $pkglist_sorts[substr($_GET["sort"],1)]["mysql"] . " DESC,";
-  }
-
-  $q_f .= "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`";
 
   $num_results = query_package_listing(
-    $q_f,
+    $extra_joins . $filter . $fuzzy_filter .
+    " ORDER BY " . package_listing_query_order_by() .
+    "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`",
     array(),
     true
   );
@@ -153,7 +145,10 @@ require_once BASE . "/lib/format.php";
     $page = 1;
 
   $fuzzy_matches = query_package_listing(
-    $q_f . " LIMIT " . (($page-1)*100) . ", 100",
+    $extra_joins . $filter . $fuzzy_filter .
+    " ORDER BY " . package_listing_query_order_by() .
+    "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`" .
+    " LIMIT " . (($page-1)*100) . ", 100",
     $float_columns,
     false
   );