From 86a27eff181d2a775cf8d67e9b26a1cb716d8ddf Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Mon, 15 Dec 2025 17:10:27 -0800 Subject: [PATCH] Check for and use DBD::MariaBB as well https://forum.virtualmin.com/t/webmin-2-6-not-available-yet/135883/45 --- mysql/cpan_modules.pl | 2 +- mysql/index.cgi | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/mysql/cpan_modules.pl b/mysql/cpan_modules.pl index 0e6bab4c1..7f5cd9e11 100755 --- a/mysql/cpan_modules.pl +++ b/mysql/cpan_modules.pl @@ -3,6 +3,6 @@ require 'mysql-lib.pl'; sub cpan_recommended { -return ( "DBI", "DBD::mysql" ); +return ( "DBI", $mysql_version =~ /mariadb/ ? "DBD::MariaDB" : "DBD::mysql" ); } diff --git a/mysql/index.cgi b/mysql/index.cgi index 50f32ed4d..d8f1f4ebd 100755 --- a/mysql/index.cgi +++ b/mysql/index.cgi @@ -320,9 +320,14 @@ else { if (foreign_available("cpan")) { eval "use DBI"; push(@needs, "DBI") if ($@); - $nodbi++ if ($@); eval "use DBD::mysql"; - push(@needs, "DBD::mysql") if ($@); + if ($@) { + eval "use DBD::MariaDB"; + if ($@) { + push(@needs, $mysql_version =~ /mariadb/ ? "DBD::MariaDB" + : "DBD::mysql"); + } + } if (@needs) { $needs = &urlize(join(" ", @needs)); print &ui_alert_box(&text(@needs == 2 ? 'index_nomods' : 'index_nomod', @needs,