lib/style.php: package_listing_query_order_by() is now integrated in query_package_listing()

1 files changed, 9 insertions, 10 deletions

diff --git a/packages/index.php b/packages/index.php
index 35f0d26..b36142f 100644
--- a/packages/index.php
+++ b/packages/index.php
@@ -122,19 +122,19 @@ require_once BASE . "/lib/format.php";
 
   $exact_matches = query_package_listing(
     $extra_joins .
-    $filter . $exact_filter .
-    " ORDER BY " .
-    "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`",
+    $filter . $exact_filter,
+    '',
     $float_columns,
+    false,
     false
   );
 
 
   $num_results = query_package_listing(
-    $extra_joins . $filter . $fuzzy_filter .
-    " ORDER BY " . package_listing_query_order_by() .
-    "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`",
+    $extra_joins . $filter . $fuzzy_filter,
+    '',
     array(),
+    true,
     true
   );
 
@@ -145,12 +145,11 @@ require_once BASE . "/lib/format.php";
     $page = 1;
 
   $fuzzy_matches = query_package_listing(
-    $extra_joins . $filter . $fuzzy_filter .
-    " ORDER BY " . package_listing_query_order_by() .
-    "`binary_packages`.`pkgname`,`repositories`.`stability`,`repositories`.`name`,`architectures`.`name`" .
+    $extra_joins . $filter . $fuzzy_filter,
     " LIMIT " . (($page-1)*100) . ", 100",
     $float_columns,
-    false
+    false,
+    true
   );
 
   function header_and_footer() {