composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-02-13 07:24:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

PR#39 Fix support of expressions (friendlyname) in different languages context (use class name by language for the expression caches)

Browse Source
This commit is contained in:
Eric
2019-01-15 11:24:48 +01:00
parent d873a5e68b
commit b8b468195c
1 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
core/expressioncache.class.inc.php
View File

@@ -27,11 +27,12 @@ class ExpressionCache
$oExpr = null;
$sKey = static::GetKey($sClass, $sAttCode);
if (class_exists('ExpressionCacheData'))
$sCacheClass = self::GetCacheClassName();
if (class_exists($sCacheClass))
{
if (array_key_exists($sKey, ExpressionCacheData::$aCache))
if (array_key_exists($sKey, $sCacheClass::$aCache))
{
$sVal = ExpressionCacheData::$aCache[$sKey];
$sVal = $sCacheClass::$aCache[$sKey];
$oExpr = unserialize($sVal);
}
}
@@ -48,6 +49,7 @@ class ExpressionCache
{
Dict::SetUserLanguage($sLang);
$sFilePath = static::GetCacheFileName();
$sCacheClass = self::GetCacheClassName();
if (!is_file($sFilePath))
{
@@ -56,7 +58,7 @@ class ExpressionCache
// Copyright (c) 2010-2019 Combodo SARL
// Generated Expression Cache file for $sLang
class ExpressionCacheData
class $sCacheClass
{
static \$aCache = array(
EOF;
@@ -100,10 +102,29 @@ EOF;
}
public static function GetCacheFileName()
{
$sLangName = self::GetLangName();
return utils::GetCachePath().'expressioncache-' . $sLangName . '.php';
}
/**
* @return string
*/
private static function GetCacheClassName()
{
$sLangName = self::GetLangName();
$sCacheClass = "ExpressionCacheData$sLangName";
return $sCacheClass;
}
/**
* @return mixed
*/
private static function GetLangName()
{
$sLang = Dict::GetUserLanguage();
$sLang = str_replace(" ", "", $sLang);
return utils::GetCachePath().'expressioncache-' . $sLang . '.php';
$sLangName = str_replace(" ", "", $sLang);
return $sLangName;
}
}