From 6cd817415a2c0b2673f7cdad55a2d712630ce467 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Thu, 8 Nov 2007 22:26:30 +0000
Subject: [PATCH] Fix: Suppression de warnings

---
 htdocs/lib/databases/mysql.lib.php  | 4 ++--
 htdocs/lib/databases/mysqli.lib.php | 4 ++--
 htdocs/lib/databases/pgsql.lib.php  | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php
index 05fef1273f5..171c93245a6 100644
--- a/htdocs/lib/databases/mysql.lib.php
+++ b/htdocs/lib/databases/mysql.lib.php
@@ -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;
diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php
index 1f6232ce540..a06d4422b6f 100644
--- a/htdocs/lib/databases/mysqli.lib.php
+++ b/htdocs/lib/databases/mysqli.lib.php
@@ -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;
diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php
index aefeab6dfec..da2656610c6 100644
--- a/htdocs/lib/databases/pgsql.lib.php
+++ b/htdocs/lib/databases/pgsql.lib.php
@@ -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;