composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-21 17:48:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/support/2.5' into release/2.6

Browse Source 
# Conflicts:
#	install.txt
This commit is contained in:
Pierre Goiffon
2019-01-09 10:51:11 +01:00
parent 23269eab77 05bcfbe4c3
commit a85bedd31c
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
application/utils.inc.php
View File

@@ -1171,7 +1171,7 @@ class utils
}
}
/**
* Get target configuration file name (including full path)
* @return string target configuration file name (including full path)
*/
public static function GetConfigFilePath($sEnvironment = null)
{
@@ -1181,6 +1181,17 @@ class utils
}
return APPCONF.$sEnvironment.'/'.ITOP_CONFIG_FILE;
}
/**
* @return string target configuration file name (including relative path)
*/
public static function GetConfigFilePathRelative($sEnvironment = null)
{
if (is_null($sEnvironment))
{
$sEnvironment = self::GetCurrentEnvironment();
}
return "conf/".$sEnvironment.'/'.ITOP_CONFIG_FILE;
}
/**
* @return string the absolute URL to the modules root path