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

(Retrofit from trunk) N.1100 Regression introduced in [r4943], aka 2.4 RC3, and causing error during MTP (accessing the wrong expression cache)

Browse Source 
SVN:2.4[5055]
This commit is contained in:
Romain Quetiez
2017-10-19 19:10:25 +00:00
parent 11b4085566
commit f932765e19
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/utils.inc.php
View File

@@ -927,7 +927,7 @@ class utils
*/
public static function GetCachePath()
{
return APPROOT.'data/cache-'.self::GetCurrentEnvironment().'/';
return APPROOT.'data/cache-'.MetaModel::GetEnvironment().'/';
}
/**
* Merge standard menu items with plugin provided menus items

8
core/metamodel.class.php
View File

@@ -4606,6 +4606,14 @@ abstract class MetaModel
return self::$m_oConfig;
}
/**
* @return string The environment in which the model has been loaded (e.g. 'production')
*/
public static function GetEnvironment()
{
return self::$m_sEnvironment;
}
public static function GetEnvironmentId()
{
return md5(APPROOT).'-'.self::$m_sEnvironment;