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

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	core/expressioncache.class.inc.php
This commit is contained in:
Pierre Goiffon
2019-02-21 17:24:37 +01:00
parent a35690d13c 1f7923beae
commit e59e62fb1b
17 changed files with 193 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,11 +77,9 @@ EOF;
}
EOF;
file_put_contents($sFilePath, $content);
}
SetupUtils::builddir(dirname($sFilePath));
file_put_contents($sFilePath, $content);
}
// Restore original user language
Dict::SetUserLanguage($sUserLang);
}
static private function GetSerializedExpression($sClass, $sAttCode)