From ff45b8f7a925f9815fa301b482a801cfe5c6aeac Mon Sep 17 00:00:00 2001
From: Jakub Vrana <jakub@vrana.cz>
Date: Fri, 12 Feb 2021 16:08:40 +0100
Subject: [PATCH] Save bytes

---
 adminer/drivers/pgsql.inc.php   |  2 +-
 adminer/include/adminer.inc.php |  4 ++--
 adminer/include/connect.inc.php | 20 +++++++++++---------
 adminer/processlist.inc.php     | 14 ++++++++------
 4 files changed, 22 insertions(+), 18 deletions(-)

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('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '
 			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
 		);
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-			if (support("scheme")) {
+		if (support("scheme")) {
+			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
 				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$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 @@
 <?php
-if (support("kill") && $_POST && !$error) {
-	$killed = 0;
-	foreach ((array) $_POST["kill"] as $val) {
-		if (kill_process($val)) {
-			$killed++;
+if (support("kill")) {
+	if ($_POST && !$error) {
+		$killed = 0;
+		foreach ((array) $_POST["kill"] as $val) {
+			if (kill_process($val)) {
+				$killed++;
+			}
 		}
+		queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 	}
-	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 }
 
 page_header(lang('Process list'), $error);