Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-16 22:41:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Correction inclusion inutile

Browse Source
This commit is contained in:
Laurent Destailleur
2007-07-13 12:57:07 +00:00
parent 7e6894734d
commit 7cdbc4af0b
4 changed files with 49 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/lib/databases/mysql.lib.php
View File

@@ -118,15 +118,25 @@ class DoliDb
*/
function DoliDb($type='mysql', $host, $user, $pass, $name='', $newlink=0)
{
global $conf,$langs;
$conffile = DOL_DOCUMENT_ROOT."/conf/conf.php";
if (file_exists($conffile)) {
include($conffile);
$this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection;
$this->db_user=$dolibarr_main_db_user;
}
$this->transaction_opened=0;
global $conf,$langs;
/* Ce test est inutile. En effet, si DOL_DOCUMENT_ROOT est d<>fini, cela signifie */
/* obligatoirement que le fichier conf a deja <20>t<EFBFBD> charg<72>e puisque cette constante est */
/* definie a partir du contenu du fichier conf.php */
/* Et toutes les infos sont charg<72>s dans l'objet conf */
/*
if (file_exists($conffile)) {
include($conffile);
$this->forcecharset=$character_set_database;
$this->forcecollate=$collation_connection;
$this->db_user=$dolibarr_main_db_user;
}
*/
$this->forcecharset=$conf->character_set_client;
$this->forcecollate=$conf->collation_connection;
$this->db_user=$conf->db->user;
$this->transaction_opened=0;
if (! function_exists("mysql_connect"))
{