Revert "Order by auto_increment column by default"

This reverts commit 79b61855e56c433b1bb8599e2c76d29f188df05d.

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 53e89bef08c62e17a02d9820e14ae200d51a3f7c..0bf53f38afb20d8d5f3e912d29b006fab5b454f6 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -277,7 +277,7 @@ username.form['auth[driver]'].onchange();
        * @return null
        */
        function selectOrderPrint($order, $columns, $indexes) {
-               print_fieldset("sort", lang('Sort'), $order && $_GET["order"]);
+               print_fieldset("sort", lang('Sort'), $order);
                $i = 0;
                foreach ((array) $_GET["order"] as $key => $val) {
                        if (isset($columns[$val])) {
@@ -440,17 +440,6 @@ username.form['auth[driver]'].onchange();
                                $return[] = (isset($fields[$val]) ? idf_escape($val) : $val) . (isset($_GET["desc"][$key]) ? " DESC" : "");
                        }
                }
-               if (!$_GET["order"]) {
-                       foreach ($fields as $name => $field) {
-                               if ($field["auto_increment"]) {
-                                       foreach ($indexes as $index) {
-                                               if ($index["columns"] == array($name)) {
-                                                       return array(idf_escape($name) . " DESC");
-                                               }
-                                       }
-                               }
-                       }
-               }
                return $return;
        }
        

diff --git a/changes.txt b/changes.txt
index 8f99074648b329c84127b81a1f8f355b890eb992..440ef9a8f46b83d1017ba1115b669f8b7380cedd 100644 (file)
--- a/changes.txt
+++ b/changes.txt
@@ -1,6 +1,5 @@
 Adminer 3.6.4-dev:
 Display pagination on a fixed position
-Order by auto_increment column by default
 Display select SQL edit form inline
 Compatibility with MySQL 5.6
 Recover original view, trigger, routine if creating fails