composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-20 09:08:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

N°2478 Fix install not working anymore when having no env-*

Browse Source
This commit is contained in:
Pierre Goiffon
2019-09-12 09:29:24 +02:00
parent e9dee86b7c
commit 24a0cc2f64
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/utils.inc.php
View File

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

3
core/metamodel.class.php
View File

@@ -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())
{

3
setup/applicationinstaller.class.inc.php
View File

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