From 24a0cc2f644d74dcf559a8fa105dee06e6a3f440 Mon Sep 17 00:00:00 2001
From: Pierre Goiffon <pierre.goiffon@combodo.com>
Date: Thu, 12 Sep 2019 09:29:24 +0200
Subject: [PATCH] =?UTF-8?q?N=C2=B02478=20Fix=20install=20not=20working=20a?=
 =?UTF-8?q?nymore=20when=20having=20no=20env-*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/utils.inc.php                | 4 ++--
 core/metamodel.class.php                 | 3 +++
 setup/applicationinstaller.class.inc.php | 3 +--
 3 files changed, 6 insertions(+), 4 deletions(-)

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);
 	}