beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Collate only if possible

Browse source 
git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@64 7c3ca157-0c34-0410-bff1-cbf682f78f5c
This commit is contained in:
jakubvrana 2007-07-06 13:00:58 +00:00
parent 4b5f78235b
commit 4e620135ed
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
database.inc.php
View file

@ -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>