From e9e5cce55a185680386b94a99693009c417d6e1c Mon Sep 17 00:00:00 2001 From: Regis Houssin Date: Thu, 12 Jul 2007 09:07:53 +0000 Subject: [PATCH] Fix: chemin du conf.php --- htdocs/lib/databases/mysql.lib.php | 4 ++-- htdocs/lib/databases/mysqli.lib.php | 2 +- htdocs/lib/databases/pgsql.lib.php | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/htdocs/lib/databases/mysql.lib.php b/htdocs/lib/databases/mysql.lib.php index 1c5ad2aa97c..1586a53dc7a 100644 --- a/htdocs/lib/databases/mysql.lib.php +++ b/htdocs/lib/databases/mysql.lib.php @@ -119,8 +119,8 @@ class DoliDb function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0) { global $conf,$langs; - $conffile = "../conf/conf.php"; - if (file_exists($conffile)) { + $conffile = DOL_DOCUMENT_ROOT."/conf/conf.php"; + if (file_exists($conffile)) { include($conffile); $this->forcecharset=$character_set_database; $this->forcecollate=$collation_connection; diff --git a/htdocs/lib/databases/mysqli.lib.php b/htdocs/lib/databases/mysqli.lib.php index 599aa6469e0..78f8f62751e 100644 --- a/htdocs/lib/databases/mysqli.lib.php +++ b/htdocs/lib/databases/mysqli.lib.php @@ -119,7 +119,7 @@ class DoliDb { global $conf,$langs; - $conffile = "../../conf/conf.php"; + $conffile = DOL_DOCUMENT_ROOT."/conf/conf.php"; if (file_exists($conffile)) { include($conffile); $this->forcecharset=$character_set_database; diff --git a/htdocs/lib/databases/pgsql.lib.php b/htdocs/lib/databases/pgsql.lib.php index 27400a1e099..b4a2e8374c7 100644 --- a/htdocs/lib/databases/pgsql.lib.php +++ b/htdocs/lib/databases/pgsql.lib.php @@ -74,9 +74,9 @@ class DoliDb */ function DoliDb($type='pgsql', $host, $user, $pass, $name='') { - global $conf,$langs; - $conffile = "../conf/conf.php"; - if (file_exists($conffile)) { + global $conf,$langs; + $conffile = DOL_DOCUMENT_ROOT."/conf/conf.php"; + if (file_exists($conffile)) { include($conffile); $this->forcecharset=$character_set_database; $this->db_user=$dolibarr_main_db_user;