From b14a2a5330a76d48a04bdd7753c1217210d9b983 Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Wed, 3 Apr 2013 10:10:15 -0700 Subject: [PATCH] Revert "Order by auto_increment column by default" This reverts commit 79b61855e56c433b1bb8599e2c76d29f188df05d. --- adminer/include/adminer.inc.php | 13 +------------ changes.txt | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php index 53e89bef..0bf53f38 100644 --- 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 8f990746..440ef9a8 100644 --- 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