Use $_SESSION['database']

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

diff --git a/connect.inc.php b/connect.inc.php
index db22707f3636e5e6fe0b41f019a53f762b54ab59..9025445dbce65331dfa6a1f4cb52754e030f6a47 100644 (file)
--- a/connect.inc.php
+++ b/connect.inc.php
@@ -1,6 +1,6 @@
 <?php
 if (!(strlen($_GET["db"]) ? $mysql->select_db($_GET["db"]) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]))) {
-       unset($_SESSION[$_GET["server"]]["databases"]);
+       unset($_SESSION["databases"][$_GET["server"]]);
        page_header(lang('Select database'));
        if (strlen($_GET["db"])) {
                echo "<p class='error'>" . lang('Invalid database.') . "</p>\n";

diff --git a/create.inc.php b/create.inc.php
index d931127c07a7ac2f3fc5ab1e61b8aaa984e4e7da..e09b371f54af8a2b68dca0d7eaa0bb9792cd041d 100644 (file)
--- a/create.inc.php
+++ b/create.inc.php
@@ -90,7 +90,7 @@ $collations = collations();
 <select name="Collation"><option value="">(<?php echo lang('collation'); ?>)</option><?php echo optionlist($collations, $row["Collation"]); ?></select>
 <input type="submit" value="<?php echo lang('Save'); ?>" />
 </p>
-<?php $column_comments = edit_fields($row["fields"]); ?>
+<?php $column_comments = edit_fields($row["fields"], $collations); ?>
 <p><?php echo lang('Comment'); ?>: <input name="Comment" value="<?php echo htmlspecialchars($row["Comment"]); ?>" maxlength="60" />
 <script type="text/javascript">
 document.write('<label for="column_comments"><input type="checkbox" id="column_comments"<?php if ($column_comments) { ?> checked="checked"<?php } ?> onclick="column_comments_click(this.checked);" /><?php echo lang('Show column comments'); ?></label>');

diff --git a/database.inc.php b/database.inc.php
index 2e6bf818145f4b54704576276287a3287c63136d..ddcfd66dc69e4ca6c701af20b0d5c404e9e1a469 100644 (file)
--- a/database.inc.php
+++ b/database.inc.php
@@ -6,7 +6,7 @@ if ($_POST && !$error) {
                }
        } elseif ($_GET["db"] !== $_POST["name"]) {
                if ($mysql->query("CREATE DATABASE " . idf_escape($_POST["name"]) . ($_POST["collation"] ? " COLLATE '" . $mysql->escape_string($_POST["collation"]) . "'" : ""))) {
-                       unset($_SESSION[$_GET["server"]]["databases"]);
+                       unset($_SESSION["databases"][$_GET["server"]]);
                        if (!strlen($_GET["db"])) {
                                redirect(preg_replace('~db=[^&]*&~', '', $SELF) . "db=" . urlencode($_POST["name"]), lang('Database has been created.'));
                        }

diff --git a/design.inc.php b/design.inc.php
index 12f8c7ca9d8a126a2f832e234040cf0ffe720260..9e9435c2bc0dc5d456f5a94119405ff8b84e8ea7 100644 (file)
--- a/design.inc.php
+++ b/design.inc.php
@@ -28,7 +28,7 @@ function page_header($title) {
                echo "<p class='message'>$_SESSION[message]</p>\n";
                $_SESSION["message"] = "";
        }
-       if (isset($_SESSION[$_GET["server"]]["databases"])) {
+       if (isset($_SESSION["databases"][$_GET["server"]])) {
                session_write_close();
        }
 }
@@ -52,10 +52,10 @@ function page_footer($missing = false) {
 <select name="db" onchange="this.form.submit();"><option value="">(<?php echo lang('database'); ?>)</option>
 <?php
                flush();
-               if (!isset($_SESSION[$_GET["server"]]["databases"])) {
-                       $_SESSION[$_GET["server"]]["databases"] = get_vals("SHOW DATABASES");
+               if (!isset($_SESSION["databases"][$_GET["server"]])) {
+                       $_SESSION["databases"][$_GET["server"]] = get_vals("SHOW DATABASES");
                }
-               echo optionlist($_SESSION[$_GET["server"]]["databases"], $_GET["db"]);
+               echo optionlist($_SESSION["databases"][$_GET["server"]], $_GET["db"]);
                ?>
 </select><?php if (isset($_GET["sql"])) { ?><input type="hidden" name="sql" value="" /><?php } ?></p>
 <noscript><p><input type="submit" value="<?php echo lang('Use'); ?>" /></p></noscript>