Order collations

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@764 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/mysql.inc.php b/adminer/include/mysql.inc.php
index 7d5ff21f03525138e9711a7cbc0aec6e6321b2c0..19807c1e4e34134bca0cc24b1fcfc9fa9db86d82 100644 (file)
--- 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 8029cb98d5d76522fb0b284a38d35137fdd1051c..a0ea0a1c82bbcadba8edd799ba190b5bc08a5248 100644 (file)
--- 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;