From 41e39073a388d6afad43134795b660eb67ce06ea Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 11 Sep 2005 16:28:16 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20Si=20on=20cr=E9e=20plusieurs=20connexion?= =?UTF-8?q?s=20(exemple=20une=20pour=20dolibarr=20et=20une=20pour=20webcal?= =?UTF-8?q?endar),=20si=20on=20a=20les=20memes=20parametres=20pour=20ces?= =?UTF-8?q?=202=20connexions=20(meme=20user=20et=20pass),=20alors=20mysql?= =?UTF-8?q?=20ne=20sait=20pas=20cr=E9er=20de=20deuxieme=20connexion.=20On?= =?UTF-8?q?=20utilise=20donc=20mysql=5Fdb=5Fquery=20plutot=20que=20mysql?= =?UTF-8?q?=5Fquery=20au=20cas=20ou=20la=202eme=20connexion=20a=20changer?= =?UTF-8?q?=20la=20base=20de=20la=20premiere.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/lib/mysql.lib.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/htdocs/lib/mysql.lib.php b/htdocs/lib/mysql.lib.php index ad547265c2d..62dcbc2d680 100644 --- a/htdocs/lib/mysql.lib.php +++ b/htdocs/lib/mysql.lib.php @@ -137,6 +137,7 @@ class DoliDb else { $this->database_selected = 0; + $this->database_name = ''; $this->ok = 0; $this->error=$this->error(); dolibarr_syslog("DoliDB::DoliDB : Erreur Select_db"); @@ -153,7 +154,7 @@ class DoliDb /** \brief Selectionne une database. - \param database nom de la database + \param database Nom de la database \return resource */ function select_db($database) @@ -295,7 +296,9 @@ class DoliDb function query($query) { $query = trim($query); - $ret = mysql_query($query, $this->db); + +// $ret = mysql_query($query, $this->db); + $ret = mysql_db_query($this->database_name, $query, $this->db); if (! eregi("^COMMIT",$query) && ! eregi("^ROLLBACK",$query)) { // Si requete utilisateur, on la sauvegarde ainsi que son resultset