From 0bf40f9c708905382960f083c3ef5d6bb68eb3ab Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Sat, 19 Mar 2011 14:47:44 +0100
Subject: [PATCH] Respect order after search (Editor)

---
 changes.txt                    |  1 +
 editor/include/adminer.inc.php | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/changes.txt b/changes.txt
index 322bbc6d..70b1dfe8 100644
--- a/changes.txt
+++ b/changes.txt
@@ -14,6 +14,7 @@ Disable maxlength with functions in edit
 Better placement of AJAX icon
 Table header in CSV export (Editor)
 Time format hint (Editor)
+Respect order after search (Editor)
 Polish translation
 
 Adminer 3.2.0 (released 2011-02-24):
diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php
index 39c7d039..eed82cc6 100644
--- a/editor/include/adminer.inc.php
+++ b/editor/include/adminer.inc.php
@@ -250,9 +250,15 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		}
 		if ($orders) {
 			echo '<fieldset><legend>' . lang('Sort') . "</legend><div>";
-			echo "<select name='index_order'>" . optionlist(array("" => "") + $orders, $_GET["index_order"], true) . "</select>";
+			echo "<select name='index_order'>" . optionlist(array("" => "") + $orders, ($_GET["order"][0] != "" ? "" : $_GET["index_order"]), true) . "</select>";
 			echo "</div></fieldset>\n";
 		}
+		if ($_GET["order"]) {
+			echo "<div style='display: none;'>" . hidden_fields(array(
+				"order" => array(1 => reset($_GET["order"])),
+				"desc" => ($_GET["desc"] ? array(1 => 1) : array()),
+			)) . "</div>\n";
+		}
 	}
 	
 	function selectLimitPrint($limit) {
@@ -322,10 +328,13 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 	}
 	
 	function selectOrderProcess($fields, $indexes) {
-		if ($_GET["order"]) {
-			return array(idf_escape($_GET["order"][0]) . (isset($_GET["desc"][0]) ? " DESC" : ""));
-		}
 		$index_order = $_GET["index_order"];
+		if ($index_order != "") {
+			unset($_GET["order"][1]);
+		}
+		if ($_GET["order"]) {
+			return array(idf_escape(reset($_GET["order"])) . ($_GET["desc"] ? " DESC" : ""));
+		}
 		foreach (($index_order != "" ? array($indexes[$index_order]) : $indexes) as $index) {
 			if ($index_order != "" || $index["type"] == "INDEX") {
 				$desc = false;