Simplify saving flavor

diff --git a/adminer/drivers/mysql.inc.php b/adminer/drivers/mysql.inc.php
index 5a6bd434109fbd6b2c6968a75477e2f9574877f9..6dc278d9c3cb9f806c33633b6a489cbbfa08cdbf 100644 (file)
--- 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 df1ecf932918fea244e96b8bb8d9901d7a1abbe3..865b26626c51fddc8b512097f83e38bd8e9d790f 100644 (file)
--- 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]));
                }
        }