diff --git a/adminer/drivers/pgsql.inc.php b/adminer/drivers/pgsql.inc.php
index add56272..402b2555 100644
--- a/adminer/drivers/pgsql.inc.php
+++ b/adminer/drivers/pgsql.inc.php
@@ -304,7 +304,7 @@ if (isset($_GET["pgsql"])) {
function tables_list() {
$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
- if (support('materializedview')) {
+ if (support('materializedview')) { // ' - support("materializedview") could be removed by compile.php
$query .= "
UNION ALL
SELECT matviewname, 'MATERIALIZED VIEW'
diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 4990399c..632e2928 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1025,8 +1025,8 @@ bodyLoad('\n"
);
echo "\n";
- if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
- if (support("scheme")) {
+ if (support("scheme")) {
+ if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
echo "
" . lang('Schema') . ": $db_events";
if ($_GET["ns"] != "") {
set_schema($_GET["ns"]);
diff --git a/adminer/include/connect.inc.php b/adminer/include/connect.inc.php
index a3e188fa..38f477c8 100644
--- a/adminer/include/connect.inc.php
+++ b/adminer/include/connect.inc.php
@@ -89,14 +89,16 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
exit;
}
-if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
- if (!isset($_GET["ns"])) {
- redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
- }
- if (!set_schema($_GET["ns"])) {
- header("HTTP/1.1 404 Not Found");
- page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
- page_footer("ns");
- exit;
+if (support("scheme")) {
+ if (DB != "" && $_GET["ns"] !== "") {
+ if (!isset($_GET["ns"])) {
+ redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
+ }
+ if (!set_schema($_GET["ns"])) {
+ header("HTTP/1.1 404 Not Found");
+ page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
+ page_footer("ns");
+ exit;
+ }
}
}
diff --git a/adminer/processlist.inc.php b/adminer/processlist.inc.php
index c2affc6a..d726161b 100644
--- a/adminer/processlist.inc.php
+++ b/adminer/processlist.inc.php
@@ -1,12 +1,14 @@