extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-05 09:32:08 +02:00
Code Issues 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 90822140b7
commit 7a7512f9dd
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'))
{
$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";
}
}
}
}