mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-11-21 23:43:17 +01:00
if no charset found in DB stay with default utf-8
This commit is contained in:
parent
95ba35bfeb
commit
59854cfe3c
@ -127,11 +127,12 @@ class setup
|
|||||||
$this->set_table_names(); // sets/checks config- and applications-table-name
|
$this->set_table_names(); // sets/checks config- and applications-table-name
|
||||||
|
|
||||||
// Set the DB's client charset if a system-charset is set
|
// Set the DB's client charset if a system-charset is set
|
||||||
if (($this->system_charset = $this->db->select($this->config_table,'config_value',array(
|
if (($charset = $this->db->select($this->config_table,'config_value',array(
|
||||||
'config_app' => 'phpgwapi',
|
'config_app' => 'phpgwapi',
|
||||||
'config_name' => 'system_charset',
|
'config_name' => 'system_charset',
|
||||||
),__LINE__,__FILE__)->fetchColumn()))
|
),__LINE__,__FILE__)->fetchColumn()))
|
||||||
{
|
{
|
||||||
|
$this->system_charset = $charset;
|
||||||
$this->db_charset_was = $this->db->Link_ID->GetCharSet(); // needed for the update
|
$this->db_charset_was = $this->db->Link_ID->GetCharSet(); // needed for the update
|
||||||
|
|
||||||
// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
|
// we can NOT set the DB charset for mysql, if the api version < 1.0.1.019, as it would mess up the DB content!!!
|
||||||
|
Loading…
Reference in New Issue
Block a user