mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-02-04 20:39:40 +01:00
fix "Invalid character set was provided" error in newer MariaDB when trying to enter setup
This commit is contained in:
parent
90822140b7
commit
7a7512f9dd
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user