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

set our default "utf-8" charset when opening db-connection, as some setup code, does not use egw-object and fail if php defaults to a different one

Browse Source
This commit is contained in:
Ralf Becker 2015-11-13 12:47:17 +00:00
parent a025f88732
commit 67df38ddbf
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
phpgwapi/inc/class.egw.inc.php
View File

@ -127,7 +127,7 @@ class egw extends egw_minimal
{
$GLOBALS['egw_info']['server'][$row['config_name']] = $row['config_value'];
}
if ($GLOBALS['egw_info']['server']['system_charset'])
if ($GLOBALS['egw_info']['server']['system_charset'] && $GLOBALS['egw_info']['server']['system_charset'] != 'utf-8')
{
$this->db->Link_ID->SetCharSet($GLOBALS['egw_info']['server']['system_charset']);
}

3
phpgwapi/inc/class.egw_db.inc.php
View File

@ -548,6 +548,9 @@ class egw_db
ini_set('mssql.textlimit',2147483647);
ini_set('mssql.sizelimit',2147483647);
}
// set our default charset
$this->Link_ID->SetCharSet('utf-8');
$new_connection = true;
}
else