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

Merge remote-tracking branch 'origin/support/2.7' into support/3.0

Browse Source 
# Conflicts:
#	core/log.class.inc.php
#	setup/modelfactory.class.inc.php
This commit is contained in:
Benjamin Dalsass
2022-06-08 12:38:41 +02:00
parent 834084a3e2 4c585614cd
commit f014ebfeb1
6 changed files with 10 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup/modelfactory.class.inc.php
View File

@@ -961,9 +961,9 @@ class ModelFactory
catch (Exception $e) {
$aLoadedModuleNames = array();
foreach (self::$aLoadedModules as $oLoadedModule) {
$aLoadedModuleNames[] = $oLoadedModule->GetName();
$aLoadedModuleNames[] = $oLoadedModule->GetName().':'.$oLoadedModule->GetVersion();
}
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',',
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(', ',
$aLoadedModuleNames));
}
}