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 branch 'develop' into feature/faf_event_service

Browse Source 
# Conflicts:
#	core/dbobject.class.php
#	datamodels/2.x/itop-config/config.php
#	lib/composer/autoload_classmap.php
#	lib/composer/autoload_static.php
#	lib/composer/installed.php
This commit is contained in:
Eric Espie
2022-06-08 16:51:44 +02:00
parent 86024107af 2b885beb82
commit 6aef59e42d
354 changed files with 53044 additions and 2685 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -971,9 +971,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));
}
}