diff --git a/htdocs/admin/receiptprinter.php b/htdocs/admin/receiptprinter.php
index 73db1bfa040..3c878c5c664 100644
--- a/htdocs/admin/receiptprinter.php
+++ b/htdocs/admin/receiptprinter.php
@@ -420,7 +420,7 @@ if ($mode == 'template' && $user->admin) {
 				print '<td></td>';
 			} else {
 				print '<td>'.$printer->listprinterstemplates[$line]['name'].'</td>';
-				print '<td>'.nl2br(htmlentities($printer->listprinterstemplates[$line]['template'])).'</td>';
+				print '<td>'.dol_htmlentitiesbr($printer->listprinterstemplates[$line]['template']).'</td>';
 				// edit icon
 				print '<td><a class="editfielda paddingleftonly marginrightonly" href="'.$_SERVER['PHP_SELF'].'?mode=template&amp;action=edittemplate&amp;templateid='.$printer->listprinterstemplates[$line]['rowid'].'">';
 				print img_picto($langs->trans("Edit"), 'edit');
diff --git a/htdocs/core/lib/json.lib.php b/htdocs/core/lib/json.lib.php
index 51eb648bf6f..cd48bbcb3c7 100644
--- a/htdocs/core/lib/json.lib.php
+++ b/htdocs/core/lib/json.lib.php
@@ -103,8 +103,7 @@ function dol_json_encode($elements)
  */
 function _val($val)
 {
-	if (is_string($val))
-	{
+	if (is_string($val)) {
 		// STRINGS ARE EXPECTED TO BE IN ASCII OR UTF-8 FORMAT
 		$ascii = '';
 		$strlen_var = strlen($val);