From 6e754d4fa55bd9cc92577446c58b4fec52846160 Mon Sep 17 00:00:00 2001
From: Molkobain <lajarige.guillaume@free.fr>
Date: Tue, 21 Jan 2020 15:50:33 +0100
Subject: [PATCH] Setup: Fix graphiz detection feedback message on Windows
 systems

---
 setup/wizardsteps.class.inc.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/setup/wizardsteps.class.inc.php b/setup/wizardsteps.class.inc.php
index 7381997af..1887863cb 100644
--- a/setup/wizardsteps.class.inc.php
+++ b/setup/wizardsteps.class.inc.php
@@ -1062,7 +1062,8 @@ EOF
 			{
 				case CheckResult::INFO:
 				$sStatus = 'ok';
-				$sMessage = json_encode('<div class="message message-valid">'.$oCheck->sLabel.'</div>');
+				$sInfoExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Graphviz\' dot found';
+				$sMessage = json_encode('<div class="message message-valid">'.$sInfoExplanation.'</div>');
 
 				break;
 
@@ -1070,7 +1071,8 @@ EOF
 				case CheckResult::ERROR:
 				case CheckResult::WARNING:
 				$sStatus = 'ko';
-				$sMessage = json_encode('<div class="message message-error">'.$oCheck->sLabel.'</div>');
+				$sErrorExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Could not find Graphviz\' dot';
+				$sMessage = json_encode('<div class="message message-error">'.$sErrorExplanation.'</div>');
 
 			}
 			$oPage->add_ready_script(
@@ -1189,7 +1191,8 @@ EOF
 			{
 				case CheckResult::INFO:
 				$sStatus = 'ok';
-				$sMessage = json_encode('<div class="message message-valid">'.$oCheck->sLabel.'</div>');
+				$sInfoExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Graphviz\' dot found';
+				$sMessage = json_encode('<div class="message message-valid">'.$sInfoExplanation.'</div>');
 
 				break;
 
@@ -1197,7 +1200,8 @@ EOF
 				case CheckResult::ERROR:
 				case CheckResult::WARNING:
 				$sStatus = 'ko';
-				$sMessage = json_encode('<div class="message message-error">'.$oCheck->sLabel.'</div>');
+				$sErrorExplanation = (json_encode($oCheck->sLabel) !== false) ? $oCheck->sLabel : 'Could not find Graphviz\' dot';
+				$sMessage = json_encode('<div class="message message-error">'.$sErrorExplanation.'</div>');
 
 			}
 			$oPage->add_ready_script(