mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 06:30:59 +01:00
fix "Invalid character set was provided" error in newer MariaDB when trying to enter setup
This commit is contained in:
parent
166db3f4d2
commit
ecf15cf982
@ -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";
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user