lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: No use of $conf in conf classe

Browse Source
This commit is contained in:
Laurent Destailleur 2009-04-29 20:01:53 +00:00
parent 51b142ae21
commit 4e7f20e35e
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/core/conf.class.php
View File

@ -156,10 +156,10 @@ class Conf
// Define default dir_output and dir_temp for directories of modules // Define default dir_output and dir_temp for directories of modules
foreach($this->modules as $module) foreach($this->modules as $module)
{ {
if (empty($conf->$module->dir_output)) $conf->$module->dir_output=$rootfordata."/".$module; if (empty($this->$module->dir_output)) $this->$module->dir_output=$rootfordata."/".$module;
else $conf->$module->dir_output=$rootfordata.$conf->$module->dir_output; else $this->$module->dir_output=$rootfordata.$this->$module->dir_output;
if (empty($conf->$module->dir_temp)) $conf->$module->dir_temp=$rootfordata."/".$module."/temp"; if (empty($this->$module->dir_temp)) $this->$module->dir_temp=$rootfordata."/".$module."/temp";
else $conf->$module->dir_temp=$rootfordata.$conf->$module->dir_temp; else $this->$module->dir_temp=$rootfordata.$this->$module->dir_temp;
} }
// For backward compatibility // For backward compatibility
@ -368,7 +368,7 @@ class Conf
if (! isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN=8; if (! isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN=8;
// Define umask // Define umask
if (empty($conf->global->MAIN_UMASK)) $conf->global->MAIN_UMASK='0664'; if (empty($this->global->MAIN_UMASK)) $this->global->MAIN_UMASK='0664';
/* \todo Ajouter une option Gestion de la TVA dans le module compta qui permet de desactiver la fonction TVA /* \todo Ajouter une option Gestion de la TVA dans le module compta qui permet de desactiver la fonction TVA
* (pour particuliers ou liberaux en franchise) * (pour particuliers ou liberaux en franchise)