Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

La gestion des bases en UTF8 sera au programme de la prochaine version

Browse Source
This commit is contained in:
Laurent Destailleur
2007-12-21 19:27:57 +00:00
parent 76f034ded6
commit 7b27328df6
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -158,13 +158,6 @@ class DoliDb
$this->db = $this->connect($host, $user, $pass, $name, $newlink); $this->db = $this->connect($host, $user, $pass, $name, $newlink);
if ($this->db) if ($this->db)
{ {
// Si client connect<63> avec charset different de celui de la base Dolibarr
// (La base Dolibarr a <20>t<EFBFBD> forc<72>e en this->forcecharset <20> l'install)
if (mysql_client_encoding ( $this->db ) != $this->forcecharset)
{
$this->query("SET NAMES '".$this->forcecharset."'", $this->db);
$this->query("SET CHARACTER SET ". $this->forcecharset);
}
$this->connected = 1; $this->connected = 1;
$this->ok = 1; $this->ok = 1;
} }
@@ -185,6 +178,14 @@ class DoliDb
$this->database_selected = 1; $this->database_selected = 1;
$this->database_name = $name; $this->database_name = $name;
$this->ok = 1; $this->ok = 1;
// Si client connect<63> avec charset different de celui de la base Dolibarr
// (La base Dolibarr a <20>t<EFBFBD> forc<72>e en this->forcecharset <20> l'install)
/*if (mysql_client_encoding ( $this->db ) != $this->getDefaultCharacterSetDatabase())
{
$this->query("SET NAMES '".$this->forcecharset."'", $this->db);
$this->query("SET CHARACTER SET ". $this->forcecharset);
}*/
} }
else else
{ {

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

@@ -160,12 +160,6 @@ class DoliDb
if ($this->db) if ($this->db)
{ {
// Si client connect<63> avec charset different de celui de Dolibarr
/*if (mysqli_client_encoding ( $this->db ) != $this->forcecharset)
{
$this->query("SET NAMES '".$this->forcecharset."'", $this->db);
$this->query("SET CHARACTER SET '".$this->forcecharset."'", $this->db);
}*/
$this->connected = 1; $this->connected = 1;
$this->ok = 1; $this->ok = 1;
} }
@@ -186,6 +180,13 @@ class DoliDb
$this->database_selected = 1; $this->database_selected = 1;
$this->database_name = $name; $this->database_name = $name;
$this->ok = 1; $this->ok = 1;
// Si client connect<63> avec charset different de celui de Dolibarr
/*if (mysqli_client_encoding ( $this->db ) != $this->getDefaultCharacterSetDatabase())
{
$this->query("SET NAMES '".$this->forcecharset."'", $this->db);
$this->query("SET CHARACTER SET '".$this->forcecharset."'", $this->db);
}*/
} }
else else
{ {