From d5498a41fb2dff547a6310d57389106ad0c52310 Mon Sep 17 00:00:00 2001
From: Rodolphe Quiedeville <rodolphe@quiedeville.org>
Date: Fri, 12 Sep 2003 22:07:09 +0000
Subject: [PATCH] Modif mineure

---
 htdocs/main.inc.php | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index d1904820c56..0fdb9493f2f 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -51,10 +51,13 @@ require (DOL_DOCUMENT_ROOT."/conf/conf.class.php");
  * Doit figurer aprés l'inclusion de conf.class.php pour overider certaines variables, à terme conf.class.php devra etre un fichier qui ne sera pas modifié par l'utilisateur
  */
 $conf = new Conf();
-$conf->db->host = $dolibarr_main_db_host;
-$conf->db->name = $dolibarr_main_db_name;
-$conf->db->user = $dolibarr_main_db_user;
-$conf->db->pass = $dolibarr_main_db_pass;
+if (!strlen(getenv("LLX_DBNAME")))
+{
+  $conf->db->host = $dolibarr_main_db_host;
+  $conf->db->name = $dolibarr_main_db_name;
+  $conf->db->user = $dolibarr_main_db_user;
+  $conf->db->pass = $dolibarr_main_db_pass;
+}
 
 require (DOL_DOCUMENT_ROOT ."/lib/mysql.lib.php");
 require (DOL_DOCUMENT_ROOT ."/lib/functions.inc.php");