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

Fix: Suppression de warnings

Browse Source
This commit is contained in:
Laurent Destailleur 2007-11-08 22:26:30 +00:00
parent dbfe66b0b6
commit 6cd817415a
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -133,10 +133,10 @@ class DoliDb
$this->db_user=$dolibarr_main_db_user;
}
*/
if ($conf->db->character_set && $conf->db->character_set != null && $conf->db->character_set !=""){
if (isset($conf->db->character_set) && $conf->db->character_set) {
$this->forcecharset=$conf->db->character_set;
}
if ($conf->db->collation_connection && $conf->db->collation_connection != null && $conf->db->collation_connection !=""){
if (isset($conf->db->collation_connection) && $conf->db->collation_connection) {
$this->forcecollate=$conf->db->collation_connection;
}
$this->db_user=$conf->db->user;

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

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

5
htdocs/lib/databases/pgsql.lib.php
View File

@ -53,13 +53,14 @@ class DoliDb
var $connected; // 1 si connecté, 0 sinon
var $database_selected; // 1 si base sélectionné, 0 sinon
var $database_name; // Nom base sélectionnée
var $database_user; //! Nom user base
var $database_user; //! Nom user base
var $transaction_opened; // 1 si une transaction est en cours, 0 sinon
var $lastquery;
var $lastqueryerror; // Ajout d'une variable en cas d'erreur
var $ok;
var $error;
var $lasterror;
@ -89,7 +90,7 @@ class DoliDb
}
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
$this->forcecollate=$conf->db->collation_connection;
$this->db_user=$conf->db->user;
$this->transaction_opened=0;