mirror/php-adminer
1
0
Fork 0
mirror of https://github.com/vrana/adminer.git synced 2025-08-07 15:16:44 +02:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jakub Vrana
2025-03-18 16:30:23 +01:00
parent 751405e006
commit eeb78d7e48
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adminer/include/adminer.inc.php
View File

@@ -1001,7 +1001,7 @@ class Adminer {
$output = ""; $output = "";
foreach ((array) $_SESSION["pwds"] as $vendor => $servers) { foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
foreach ($servers as $server => $usernames) { 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) { foreach ($usernames as $username => $password) {
if ($password !== null) { if ($password !== null) {
$dbs = $_SESSION["db"][$vendor][$server][$username]; $dbs = $_SESSION["db"][$vendor][$server][$username];

2
adminer/include/auth.inc.php
View File

@@ -188,7 +188,7 @@ if (isset($_GET["username"]) && is_string(get_password())) {
$adminer->operators = $driver->operators; $adminer->operators = $driver->operators;
} }
if (isset($connection->maria) || $connection->cockroach) { if (isset($connection->maria) || $connection->cockroach) {
save_settings(array("vendor-" . SERVER => $drivers[DRIVER])); save_settings(array("vendor-" . DRIVER . "-" . SERVER => $drivers[DRIVER]));
} }
} }
} }