Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix: On fait bien la distinction entre le charset et collation du fichier de config avec le charset et collation de la base.

Browse Source
This commit is contained in:
Laurent Destailleur
2007-12-21 19:14:11 +00:00
parent 3f7ad505ad
commit 76f034ded6
10 changed files with 51 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,15 +122,15 @@ class DoliDb
if (file_exists($conffile)) {
include($conffile);
$this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection;
$this->forcecollate=$dolibarr_main_db_collation;
$this->db_user=$dolibarr_main_db_user;
}
*/
if (isset($conf->db->character_set) && $conf->db->character_set) {
$this->forcecharset=$conf->db->character_set;
}
if (isset($conf->db->collation_connection) && $conf->db->collation_connection) {
$this->forcecollate=$conf->db->collation_connection;
if (isset($conf->db->dolibarr_main_db_collation) && $conf->db->dolibarr_main_db_collation) {
$this->forcecollate=$conf->db->dolibarr_main_db_collation;
}
$this->db_user=$conf->db->user;
@@ -879,6 +879,10 @@ class DoliDb
return 1;
}
/**
* \brief Return charset used to store data in database
* \return string Charset
*/
function getDefaultCharacterSetDatabase(){
$resql=$this->query('SHOW VARIABLES LIKE \'character_set_database\'');
if (!$resql)
@@ -910,7 +914,11 @@ class DoliDb
return $liste;
}
function getDefaultCollationConnection(){
/**
* \brief Return collation used in database
* \return string Collation value
*/
function getDefaultCollationDatabase(){
$resql=$this->query('SHOW VARIABLES LIKE \'collation_database\'');
if (!$resql)
{