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

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

Browse Source 
# Conflicts:
#	setup/modelfactory.class.inc.php
#	setup/setuputils.class.inc.php
This commit is contained in:
Pierre Goiffon
2024-03-13 09:27:06 +01:00
parent 289ca7b505 986c24d777
commit a337ef3d88
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -952,10 +952,13 @@ class ModelFactory
$this->aDictKeys[$sLanguageCode][$sCode] = $oXmlEntry;
}
}
}
catch (Exception $e) {
throw new Exception('Failed to load dictionary file "'.$sPHPFile.'", reason: '.$e->getMessage());
}
} catch (Exception|Error $e) // Error can occurs on eval() calls
{
throw new DictException('Failed to load dictionary file "' . $sPHPFile . '"', [
'exception_class' => get_class($e),
'exception_msg' => $e->getMessage(),
]);
}
}
catch (Exception $e) {