holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix "Invalid character set was provided" error in newer MariaDB when trying to enter setup

Browse Source
This commit is contained in:
ralf 2022-04-21 19:52:19 +02:00
parent 166db3f4d2
commit ecf15cf982
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/inc/class.setup.inc.php
View File

@ -145,7 +145,8 @@ class setup
} }
if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019')) if (!$api_version || !$this->alessthanb($api_version,'1.0.1.019'))
{ {
$this->db->Link_ID->SetCharSet($this->system_charset); $this->db->Link_ID->SetCharSet($this->system_charset === 'utf-8' &&
$this->db->Type === 'mysql' ? 'utf8' : $this->system_charset);
} }
} }
} }
@ -1293,4 +1294,4 @@ class setup
//echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n"; //echo "<p>setup::set_table_names: $name = '{$this->$name}'</p>\n";
} }
} }
} }