diff --git a/application/utils.inc.php b/application/utils.inc.php index c162ab0b1..336574acb 100644 --- a/application/utils.inc.php +++ b/application/utils.inc.php @@ -727,7 +727,7 @@ class utils if (file_exists($sCurrentEnvConfigPath)) { $oCurrentEnvDiskConfig = new Config($sCurrentEnvConfigPath); - self::$oConfig = $oCurrentEnvDiskConfig; + self::SetConfig($oCurrentEnvDiskConfig); return self::$oConfig; } @@ -735,7 +735,7 @@ class utils if (file_exists($sProductionEnvConfigPath)) { $oProductionEnvDiskConfig = new Config($sProductionEnvConfigPath); - self::$oConfig = $oProductionEnvDiskConfig; + self::SetConfig($oProductionEnvDiskConfig); return self::$oConfig; } diff --git a/core/metamodel.class.php b/core/metamodel.class.php index 0660c91b3..ce1511ebd 100644 --- a/core/metamodel.class.php +++ b/core/metamodel.class.php @@ -6250,6 +6250,9 @@ abstract class MetaModel { self::$m_oConfig = $oConfiguration; + // N°2478 not necessary (MetaModel should always be called before using cache) but this is a precaution O:) + utils::SetConfig($oConfiguration); + // Set log ASAP if (self::$m_oConfig->GetLogGlobal()) { diff --git a/setup/applicationinstaller.class.inc.php b/setup/applicationinstaller.class.inc.php index 534089784..1e1ef59ef 100644 --- a/setup/applicationinstaller.class.inc.php +++ b/setup/applicationinstaller.class.inc.php @@ -57,8 +57,7 @@ class ApplicationInstaller $aParamValues = $oParams->GetParamForConfigArray(); $oConfig = new Config(); - $sTargetDir = $this->GetTargetDir(); - $oConfig->UpdateFromParams($aParamValues, $sTargetDir); + $oConfig->UpdateFromParams($aParamValues, null); utils::SetConfig($oConfig); }