From d2fa62d2842bd0b98e3194ccc82edab8054146fc Mon Sep 17 00:00:00 2001
From: jakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Date: Mon, 29 Jun 2009 10:10:59 +0000
Subject: [PATCH] Order collations

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@764 7c3ca157-0c34-0410-bff1-cbf682f78f5c
---
 adminer/include/mysql.inc.php | 10 +++++-----
 adminer/procedure.inc.php     |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 7d5ff21f..19807c1e 100644
--- a/adminer/include/mysql.inc.php
+++ b/adminer/include/mysql.inc.php
@@ -311,13 +311,13 @@ function collations() {
 	$return = array();
 	$result = $dbh->query("SHOW COLLATION");
 	while ($row = $result->fetch_assoc()) {
-		if ($row["Default"] && $return[$row["Charset"]]) {
-			array_unshift($return[$row["Charset"]], $row["Collation"]);
-		} else {
-			$return[$row["Charset"]][] = $row["Collation"];
-		}
+		$return[$row["Charset"]][] = $row["Collation"];
 	}
 	$result->free();
+	ksort($return);
+	foreach ($return as $key => $val) {
+		sort($return[$key]);
+	}
 	return $return;
 }
 
diff --git a/adminer/procedure.inc.php b/adminer/procedure.inc.php
index 8029cb98..a0ea0a1c 100644
--- a/adminer/procedure.inc.php
+++ b/adminer/procedure.inc.php
@@ -25,6 +25,7 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 page_header((strlen($_GET["procedure"]) ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . htmlspecialchars($_GET["procedure"]) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 
 $collations = get_vals("SHOW CHARACTER SET");
+sort($collations);
 $row = array("fields" => array());
 if ($_POST) {
 	$row = $_POST;