Amélioration du support des charsets

This commit is contained in:
cdelambert
2007-07-21 10:01:41 +00:00
parent 67d5846dca
commit 354788fa95
2 changed files with 12 additions and 4 deletions

View File

@@ -132,8 +132,12 @@ class DoliDb
$this->db_user=$dolibarr_main_db_user;
}
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
if ($conf->db->character_set && $conf->db->character_set != null && $conf->db->character_set !=""){
$this->forcecharset=$conf->db->character_set;
}
if ($conf->db->collation_connection && $conf->db->collation_connection != null && $conf->db->collation_connection !=""){
$this->forcecollate=$conf->db->collation_connection;
}
$this->db_user=$conf->db->user;
$this->transaction_opened=0;