Fix collations display
This commit is contained in:
parent
edf88e674c
commit
b4eea5f671
|
@ -57,10 +57,7 @@ if ($_POST) {
|
||||||
echo ($_POST["add_x"] || strpos($name, "\n")
|
echo ($_POST["add_x"] || strpos($name, "\n")
|
||||||
? '<textarea name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
|
? '<textarea name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
|
||||||
: '<input name="name" value="' . h($name) . '" maxlength="64">'
|
: '<input name="name" value="' . h($name) . '" maxlength="64">'
|
||||||
) . "\n";
|
) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
|
||||||
if ($collations) {
|
|
||||||
html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate);
|
|
||||||
}
|
|
||||||
?>
|
?>
|
||||||
<input type="hidden" name="token" value="<?php echo $token; ?>">
|
<input type="hidden" name="token" value="<?php echo $token; ?>">
|
||||||
<input type="submit" value="<?php echo lang('Save'); ?>">
|
<input type="submit" value="<?php echo lang('Save'); ?>">
|
||||||
|
|
|
@ -514,6 +514,7 @@ if (!defined("DRIVER")) {
|
||||||
* @return string
|
* @return string
|
||||||
*/
|
*/
|
||||||
function create_database($db, $collation) {
|
function create_database($db, $collation) {
|
||||||
|
global $connection;
|
||||||
set_session("databases", null);
|
set_session("databases", null);
|
||||||
return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
|
return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . $connection->quote($collation) : ""));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue