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

Fix errors in setup/modelfactory.class.inc.php

Browse Source
This commit is contained in:
Pierre Goiffon
2020-12-11 10:49:41 +01:00
parent 728c09d97d
commit 17cecde604
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -486,6 +486,7 @@ class MFDictModule extends MFModule
// Directories to scan
foreach(glob($sDir.'/*', GLOB_ONLYDIR|GLOB_NOSORT) as $sSubDir)
{
/** @noinspection SlowArrayOperationsInLoopInspection */
$aDictionaries = array_merge($aDictionaries, $this->GetDictionaryFiles($sSubDir));
}
}
@@ -943,18 +944,15 @@ class ModelFactory
}
}
}
catch (Exception $e)
{
catch (Exception $e) {
throw new Exception('Failed to load dictionary file "'.$sPHPFile.'", reason: '.$e->getMessage());
}
}
catch (Exception $e)
{
catch (Exception $e) {
$aLoadedModuleNames = array();
foreach (self::$aLoadedModules as $oModule)
{
$aLoadedModuleNames[] = $oModule->GetName();
foreach (self::$aLoadedModules as $oLoadedModule) {
$aLoadedModuleNames[] = $oLoadedModule->GetName();
}
throw new Exception('Error loading module "'.$oModule->GetName().'": '.$e->getMessage().' - Loaded modules: '.implode(',',
$aLoadedModuleNames));

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

@@ -126,6 +126,8 @@ class PHPParameters extends Parameters
class XMLParameters extends Parameters
{
/** @var array */
public $aData;
protected $sParametersFile;
public function __construct($sParametersFile)