michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-03-20 08:40:24 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Also fix MySQL strings in PHP-INI module https://github.com/virtualmin/virtualmin-gpl/issues/464

Browse Source
This commit is contained in:
Jamie Cameron
2022-10-08 23:22:52 -07:00
parent 06094e22f4
commit 4ae46dbe83
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mysql/mysql-lib.pl
View File

@@ -77,11 +77,16 @@ EOF
}
# Fix text if we're running MariaDB
sub fix_mysql_text
{
my ($text) = @_;
if ($mysql_version =~ /mariadb/i) {
foreach my $t (keys %text) {
$text{$t} =~ s/MySQL/MariaDB/g;
foreach my $t (keys %$text) {
$text->{$t} =~ s/MySQL/MariaDB/g;
}
}
}
&fix_mysql_text(\%text);
if (&compare_version_numbers($mysql_version, "5.5") >= 0) {
@mysql_set_variables = ( "key_buffer_size", "sort_buffer_size",

6
phpini/phpini-lib.pl
View File

@@ -5,6 +5,12 @@ use WebminCore;
&init_config();
%access = &get_module_acl();
# Fix language strings that refer to MySQL
if (&foreign_check("mysql")) {
&foreign_require("mysql");
&mysql::fix_mysql_text(\%text);
}
# get_config_fmt(file)
# Returns a format code for php.ini or FPM config files
sub get_config_fmt