Respect scheme support

diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index 840b11e8545b851973c9facfc9737aa24eafb897..64cd625490893972560455f034b30f03a1e26038 100644 (file)
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -25,6 +25,7 @@ function connect_error() {
                echo "<p>" . lang('Logged as: %s', "<b>" . h(logged_user()) . "</b>") . "\n";
                $databases = get_databases();
                if ($databases) {
+                       $scheme = support("scheme");
                        $collations = collations();
                        echo "<form action='' method='post'>\n";
                        echo "<table cellspacing='0' onclick='tableClick(event);'>\n";
@@ -33,7 +34,7 @@ function connect_error() {
                                $root = h(ME) . "db=" . urlencode($db);
                                echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]));
                                echo "<th><a href='$root'>" . h($db) . "</a>";
-                               echo "<td><a href='$root&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
+                               echo "<td><a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database='>" . nbsp(db_collation($db, $collations)) . "</a>";
                                echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "'>?</a>";
                                echo "\n";
                        }

diff --git a/todo.txt b/todo.txt
index 1e7724302c9e1f0662b2abc3b5ff38c6c6669448..611ed1b425dc21498056df473526503ed3437bd2 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -1,6 +1,6 @@
 Transactions in export
 Create view and routine options
-Variables editation, especially timezone
+Variables editation, especially timezone (or set by PHP date.timezone)
 Highlight SQL textarea, then display query inside textarea in select - may use external CodeMirror
 Blob download and image display in edit form (important for Editor with hidden fields in select)
 Add title to Logout, edit (in select) and select (in menu) in style "hever"
@@ -34,6 +34,7 @@ Delimiter in export and SQL command
 Backward keys in Editor
 
 PostgreSQL:
+Display number of schemas in databases overview
 Users - SELECT * FROM pg_user
 ORDER BY COUNT(*)
 Export - http://www.postgresql.org/docs/8.4/static/functions-info.html