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

N°7803 - MTP from itophub/designer failing in itop 3.2.0

Browse Source
This commit is contained in:
Eric Espie
2024-12-16 16:44:59 +01:00
parent 8647a76dbf
commit 32ef639ce1
5 changed files with 48 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
setup/applicationinstaller.class.inc.php
View File

@@ -1089,7 +1089,7 @@ class ApplicationInstaller
// Ready to go !!
require_once(APPROOT.'core/dict.class.inc.php');
MetaModel::ResetCache();
MetaModel::ResetAllCaches();
}
}

10
setup/runtimeenv.class.inc.php
View File

@@ -125,7 +125,7 @@ class RunTimeEnvironment
if (!$bUseCache)
{
// Reset the cache for the first use !
MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
MetaModel::ResetAllCaches($this->sTargetEnv);
}
MetaModel::Startup($oConfig, $bModelOnly, $bUseCache, false /* $bTraceSourceFiles */, $this->sTargetEnv);
@@ -534,11 +534,7 @@ class RunTimeEnvironment
$oMFCompiler = new MFCompiler($oFactory, $this->sFinalEnv);
$oMFCompiler->Compile($sTargetDir, null, $bUseSymLinks, $bSkipTempDir);
$sCacheDir = APPROOT.'data/cache-'.$this->sTargetEnv;
SetupUtils::builddir($sCacheDir);
SetupUtils::tidydir($sCacheDir);
MetaModel::ResetCache(md5(APPROOT).'-'.$this->sTargetEnv);
MetaModel::ResetAllCaches($this->sTargetEnv);
return array_keys($aModulesToCompile);
}
@@ -994,7 +990,7 @@ class RunTimeEnvironment
@chmod($sFinalConfig, 0440); // Read-only for owner and group, nothing for others
@rmdir(dirname($sTargetConfig)); // Cleanup the temporary build dir if empty
MetaModel::ResetCache(md5(APPROOT).'-'.$this->sFinalEnv);
MetaModel::ResetAllCaches($this->sFinalEnv);
}
}

11
setup/setuputils.class.inc.php
View File

@@ -790,15 +790,16 @@ class SetupUtils
// avoid unnecessary warning
// Try 100 times...
$i = 100;
while ((@rmdir($dir) === false) && $i > 0)
{
while ((@rmdir($dir) === false) && $i > 0) {
// Magic trick for windows
// sometimes the folder is empty but rmdir fails
closedir(opendir($dir));
$oDir = opendir($dir);
if ($oDir !== false) {
closedir($oDir);
}
$i--;
}
if ($i == 0)
{
if ($i == 0) {
rmdir($dir);
}
}