lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Amélioration du support des charsets

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/lib/databases/mysql.lib.php
View File

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

4
htdocs/lib/databases/mysqli.lib.php
View File

@ -131,8 +131,12 @@ class DoliDb
$this->db_user=$dolibarr_main_db_user; $this->db_user=$dolibarr_main_db_user;
} }
*/ */
if ($conf->db->character_set && $conf->db->character_set != null && $conf->db->character_set !=""){
$this->forcecharset=$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->forcecollate=$conf->db->collation_connection;
}
$this->db_user=$conf->db->user; $this->db_user=$conf->db->user;
$this->transaction_opened=0; $this->transaction_opened=0;