From 2c72b879e9710efea66af3ae11c52a6b97a2fb6b Mon Sep 17 00:00:00 2001 From: Jakub Vrana Date: Tue, 25 Mar 2025 06:15:09 +0100 Subject: [PATCH] Simplify saving flavor --- adminer/drivers/mysql.inc.php | 2 +- adminer/include/auth.inc.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php index 5a6bd434..6dc278d9 100644 --- a/adminer/drivers/mysql.inc.php +++ b/adminer/drivers/mysql.inc.php @@ -452,7 +452,7 @@ if (!defined('Adminer\DRIVER')) { if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) { $connection->set_charset(charset($connection)); $connection->query("SET sql_quote_show_create = 1, autocommit = 1"); - $connection->flavor = (preg_match('~MariaDB~', $connection->server_info) ? 'maria' : ''); + $connection->flavor = (preg_match('~MariaDB~', $connection->server_info) ? 'maria' : 'mysql'); $drivers[DRIVER] = ($connection->flavor == 'maria' ? "MariaDB" : "MySQL"); return $connection; } diff --git a/adminer/include/auth.inc.php b/adminer/include/auth.inc.php index df1ecf93..865b2662 100644 --- a/adminer/include/auth.inc.php +++ b/adminer/include/auth.inc.php @@ -187,7 +187,7 @@ if (isset($_GET["username"]) && is_string(get_password())) { if ($adminer->operators === null) { $adminer->operators = $driver->operators; } - if (Driver::$jush == 'sql' || $connection->flavor == 'cockroach') { + if ($connection->flavor) { save_settings(array("vendor-" . DRIVER . "-" . SERVER => $drivers[DRIVER])); } }