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

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

Browse Source
This commit is contained in:
Eric Espie
2024-05-21 15:07:08 +02:00
parent d98e35d918 62caf16153
commit f632cf3155
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/simplegraph.class.inc.php
View File

@@ -537,7 +537,7 @@ EOF
} }
else else
{ {
throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')'); throw new Exception('graphviz not found');
} }
return $sHtml; return $sHtml;
} }
@@ -592,7 +592,7 @@ EOF
} }
else else
{ {
throw new Exception('graphviz not found (executable path: '.$sDotExecutable.')'); throw new Exception('graphviz not found');
} }
return $sHtml; return $sHtml;
} }

4
setup/unattended-install/unattended-install.php
View File

@@ -25,7 +25,9 @@ EOF;
exit(-1); exit(-1);
} }
///////////////////////////////////////////////// /////////////////////////////////////////////////
if (! utils::IsModeCLI())
$sCleanName = strtolower(trim(PHP_SAPI));
if ($sCleanName !== 'cli')
{ {
echo "Mode CLI only"; echo "Mode CLI only";
exit(-1); exit(-1);