mirror of
https://github.com/Dolibarr/dolibarr.git
synced 2025-12-06 09:38:23 +01:00
Fix: chemin du conf.php
This commit is contained in:
@@ -119,8 +119,8 @@ class DoliDb
|
|||||||
function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0)
|
function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0)
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
|
||||||
if (file_exists($conffile)) {
|
if (file_exists($conffile)) {
|
||||||
include($conffile);
|
include($conffile);
|
||||||
$this->forcecharset=$character_set_database;
|
$this->forcecharset=$character_set_database;
|
||||||
$this->forcecollate=$collation_connection;
|
$this->forcecollate=$collation_connection;
|
||||||
|
|||||||
@@ -119,7 +119,7 @@ class DoliDb
|
|||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
|
|
||||||
$conffile = "../../conf/conf.php";
|
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
|
||||||
if (file_exists($conffile)) {
|
if (file_exists($conffile)) {
|
||||||
include($conffile);
|
include($conffile);
|
||||||
$this->forcecharset=$character_set_database;
|
$this->forcecharset=$character_set_database;
|
||||||
|
|||||||
@@ -74,9 +74,9 @@ class DoliDb
|
|||||||
*/
|
*/
|
||||||
function DoliDb($type='pgsql', $host, $user, $pass, $name='')
|
function DoliDb($type='pgsql', $host, $user, $pass, $name='')
|
||||||
{
|
{
|
||||||
global $conf,$langs;
|
global $conf,$langs;
|
||||||
$conffile = "../conf/conf.php";
|
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
|
||||||
if (file_exists($conffile)) {
|
if (file_exists($conffile)) {
|
||||||
include($conffile);
|
include($conffile);
|
||||||
$this->forcecharset=$character_set_database;
|
$this->forcecharset=$character_set_database;
|
||||||
$this->db_user=$dolibarr_main_db_user;
|
$this->db_user=$dolibarr_main_db_user;
|
||||||
|
|||||||
Reference in New Issue
Block a user