From b9f14bf6e159e5e24477289a9eeed083d61407c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come.chilliet@fusiondirectory.org>
Date: Thu, 24 Jun 2021 16:17:26 +0200
Subject: [PATCH] :ambulance: fix(msgPool) Improve siError formatting
issue #6172
---
include/class_msgPool.inc | 2 +-
include/class_msg_dialog.inc | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/class_msgPool.inc b/include/class_msgPool.inc
index 1a165134d..2f7cd3f38 100644
--- a/include/class_msgPool.inc
+++ b/include/class_msgPool.inc
@@ -569,7 +569,7 @@ class msgPool
if ($error == '') {
return htmlescape(_('Communication failure with the infrastructure service!'));
}
- return sprintf(htmlescape(_('Communication failure with the infrastructure service: %s')), '<br/><br/>'.htmlescape(sprintf(_('Error: %s'), $error)));
+ return nl2br(htmlescape(sprintf(_("Communication failure with the infrastructure service: %s\n\nError: %s"), $error)));
}
/*!
diff --git a/include/class_msg_dialog.inc b/include/class_msg_dialog.inc
index dfb8e155e..65c13f64c 100644
--- a/include/class_msg_dialog.inc
+++ b/include/class_msg_dialog.inc
@@ -116,7 +116,7 @@ class msg_dialog
*
* \param string|object $title The title of the message dialog, or the error object
*
- * \param string $message The message of the message dialog
+ * \param string $message The message of the message dialog (HTML)
*
* \param int $type The type of the message dialog, by default = INFO_DIALOG
*
--
GitLab