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 develop

Browse Source 
# Conflicts:
#	core/config.class.inc.php
#	datamodels/2.x/itop-core-update/view/SelectUpdateFile.html.twig
#	datamodels/2.x/itop-core-update/view/SelectUpdateFile.ready.js.twig
#	setup/setuputils.class.inc.php
#	test/setup/SetupUtilsTest.php
This commit is contained in:
bruno-ds
2021-03-02 14:34:19 +01:00
parent 77d4613bd8 d4607ee815
commit 9cbaced1f3
21 changed files with 271 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -618,7 +618,7 @@ class SetupUtils
if (!is_file($sGraphvizPath) || !is_executable($sGraphvizPath)) {
//N°3412 avoid shell injection
$aResult = [];
$aResult[] = new CheckResult(CheckResult::ERROR,
$aResult[] = new CheckResult(CheckResult::WARNING,
self::GetStringForJsonEncode("$sGraphvizPath could not be executed: Please make sure it is installed and in the path", 'Graphviz could not be executed')
);
return $aResult;