Vendor display: Do not overwrite PostgreSQL by MySQL at the same server

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index 5d68ca9d84a12a99270642f59539fc488e2a5d78..a0e41ea31e94e5fc47c46a596b40d2cc1c6447b9 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -1001,7 +1001,7 @@ class Adminer {
                        $output = "";
                        foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
                                foreach ($servers as $server => $usernames) {
-                                       $name = h(get_setting("vendor-$server") ?: $drivers[$vendor]);
+                                       $name = h(get_setting("vendor-$vendor-$server") ?: $drivers[$vendor]);
                                        foreach ($usernames as $username => $password) {
                                                if ($password !== null) {
                                                        $dbs = $_SESSION["db"][$vendor][$server][$username];

diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php
index 69229ae315d15d0151bb1d159b732e4a4c16ef6c..f53a91987d483a4979ae897eb7e6b240076ddceb 100644 (file)
--- a/adminer/include/auth.inc.php
+++ b/adminer/include/auth.inc.php
@@ -188,7 +188,7 @@ if (isset($_GET["username"]) && is_string(get_password())) {
                        $adminer->operators = $driver->operators;
                }
                if (isset($connection->maria) || $connection->cockroach) {
-                       save_settings(array("vendor-" . SERVER => $drivers[DRIVER]));
+                       save_settings(array("vendor-" . DRIVER . "-" . SERVER => $drivers[DRIVER]));
                }
        }
 }