Get $collate from SHOW CREATE DATABASE

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

diff --git a/database.inc.php b/database.inc.php
index 5a6a4329d13402f8dd8fe70adcfe05a1dd370035..7472f928bd68063e0cb7f0accb8bed430ad16edd 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -35,7 +35,7 @@ if ($_POST) {
        $collate = $_POST["collate"];
 } else {
        $name = $_GET["db"];
-       $collate = (strlen($_GET["db"]) ? mysql_result(mysql_query("SELECT DEFAULT_COLLATION_NAME FROM information_schema.SCHEMATA WHERE SCHEMA_NAME = '" . mysql_real_escape_string($_GET["db"]) . "'"), 0) : array());
+       $collate = (strlen($_GET["db"]) && preg_match('~ COLLATE ([^ ]+)~', mysql_result(mysql_query("SHOW CREATE DATABASE " . idf_escape($_GET["db"])), 0, 1), $match) ? $match[1] : array());
 }
 ?>
 <form action="" method="post"><div>