composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-23 10:38:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

(Retrofit from trunk) Small setup refactoring for getting ready for the Hub.

Browse Source 
SVN:2.4[5271]
This commit is contained in:
Denis Flaven
2018-01-17 10:13:14 +00:00
parent f237a98c1d
commit c081b89f03
6 changed files with 250 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
application/utils.inc.php
View File

@@ -615,16 +615,20 @@ class utils
{
if (self::$oConfig == null)
{
$sConfigFile = self::GetConfigFilePath();
if (file_exists($sConfigFile))
{
self::$oConfig = new Config($sConfigFile);
}
else
{
// When executing the setup, the config file may be still missing
self::$oConfig = new Config();
}
self::$oConfig = MetaModel::GetConfig();
if (self::$oConfig == null)
{
$sConfigFile = self::GetConfigFilePath();
if (file_exists($sConfigFile))
{
self::$oConfig = new Config($sConfigFile);
}
else
{
// When executing the setup, the config file may be still missing
self::$oConfig = new Config();
}
}
}
return self::$oConfig;
}