Collate only if possible

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

diff --git a/database.inc.php b/database.inc.php
index 7472f928bd68063e0cb7f0accb8bed430ad16edd..1d0b45311fc538b4fa520e5512409cccf98cefb2 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -24,7 +24,7 @@ if ($_POST) {
        } elseif (!$_POST["collation"] || mysql_query("ALTER DATABASE " . idf_escape($_POST["name"]) . " COLLATE '" . mysql_real_escape_string($_POST["collation"]) . "'")) {
                redirect(substr($SELF, 0, -1), ($_POST["collation"] ? lang('Database has been altered.') : null));
        }
-       $eror = mysql_error();
+       $error = mysql_error();
 }
 
 page_header(strlen($_GET["db"]) ? lang('Alter database') . ": " . htmlspecialchars($_GET["db"]) : lang('Create database'));
@@ -32,10 +32,16 @@ page_header(strlen($_GET["db"]) ? lang('Alter database') . ": " . htmlspecialcha
 if ($_POST) {
        echo "<p class='error'>" . lang('Unable to operate database') . ": " . htmlspecialchars($error) . "</p>\n";
        $name = $_POST["name"];
-       $collate = $_POST["collate"];
+       $collate = $_POST["collation"];
 } else {
        $name = $_GET["db"];
-       $collate = (strlen($_GET["db"]) && preg_match('~ COLLATE ([^ ]+)~', mysql_result(mysql_query("SHOW CREATE DATABASE " . idf_escape($_GET["db"])), 0, 1), $match) ? $match[1] : array());
+       $collate = array();
+       if (strlen($_GET["db"]) && ($result = mysql_query("SHOW CREATE DATABASE " . idf_escape($_GET["db"])))) {
+               if (preg_match('~ COLLATE ([^ ]+)~', mysql_result($result, 0, 1), $match)) {
+                       $collate = $match[1];
+               }
+               mysql_free_result($result);
+       }
 }
 ?>
 <form action="" method="post"><div>