composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-11 03:54:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge wrongfully performed

Browse Source 
(thanks @molkobain & @piRGoif & @odain-cbd)
This commit is contained in:
bruno-ds
2021-02-23 10:24:30 +01:00
parent 88f45a69b1
commit c3cb4fbe75
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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