From 92f653974439a33e2cbb4df90badac7fcc6b85bf Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 May 2024 18:21:50 +0200 Subject: [PATCH] Use dolPrintHTML() --- htdocs/commande/list_det.php | 6 +++--- htdocs/compta/facture/list.php | 6 +++--- htdocs/core/lib/company.lib.php | 8 +++----- htdocs/fichinter/list.php | 11 +++++------ htdocs/fourn/commande/list.php | 8 ++++---- 5 files changed, 18 insertions(+), 21 deletions(-) diff --git a/htdocs/commande/list_det.php b/htdocs/commande/list_det.php index 325747a197d..20f479385db 100644 --- a/htdocs/commande/list_det.php +++ b/htdocs/commande/list_det.php @@ -2068,8 +2068,8 @@ if ($resql) { // Note public if (!empty($arrayfields['c.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); + print ''; + print dolPrintHTML($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2079,7 +2079,7 @@ if ($resql) { // Note private if (!empty($arrayfields['c.note_private']['checked'])) { print ''; - print dol_string_nohtmltag($obj->note_private); + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; diff --git a/htdocs/compta/facture/list.php b/htdocs/compta/facture/list.php index c01164bbdbf..aca6154587a 100644 --- a/htdocs/compta/facture/list.php +++ b/htdocs/compta/facture/list.php @@ -2676,8 +2676,8 @@ if ($num > 0) { } // Note public if (!empty($arrayfields['f.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); + print ''; + print dolPrintHTML($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2686,7 +2686,7 @@ if ($num > 0) { // Note private if (!empty($arrayfields['f.note_private']['checked'])) { print ''; - print dol_string_nohtmltag($obj->note_private); + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; diff --git a/htdocs/core/lib/company.lib.php b/htdocs/core/lib/company.lib.php index 4b18fd2d911..00dd6bee597 100644 --- a/htdocs/core/lib/company.lib.php +++ b/htdocs/core/lib/company.lib.php @@ -1566,17 +1566,15 @@ function show_contacts($conf, $langs, $db, $object, $backtopage = '', $showuserl // Address - Phone - Email if (!empty($arrayfields['t.address']['checked'])) { $addresstoshow = $contactstatic->getBannerAddress('contact', $object); - print ''; + print ''; print $addresstoshow; print ''; } // Note private if (!empty($arrayfields['t.note_private']['checked'])) { - print ''; - if ($obj->note_private) { - print dol_string_nohtmltag($obj->note_private); - } + print ''; + print dolPrintHTML($obj->note_private); print ''; } diff --git a/htdocs/fichinter/list.php b/htdocs/fichinter/list.php index 29751e732aa..a17cb6f6f14 100644 --- a/htdocs/fichinter/list.php +++ b/htdocs/fichinter/list.php @@ -955,17 +955,16 @@ while ($i < $imaxinloop) { } // Note public if (!empty($arrayfields['f.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); - print ''; - if (!$i) { + print ''; + print dolPrintHTML($obj->note_public); + print '';if (!$i) { $totalarray['nbfield']++; } } // Note private if (!empty($arrayfields['f.note_private']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_private); + print ''; + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++; diff --git a/htdocs/fourn/commande/list.php b/htdocs/fourn/commande/list.php index 0bb3cbc52e5..ef294173fc3 100644 --- a/htdocs/fourn/commande/list.php +++ b/htdocs/fourn/commande/list.php @@ -2047,8 +2047,8 @@ if ($resql) { } // Note public if (!empty($arrayfields['cf.note_public']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_public); + print ''; + print dolPrintHTML($obj->note_public); print ''; if (!$i) { $totalarray['nbfield']++; @@ -2057,8 +2057,8 @@ if ($resql) { // Note private if (!empty($arrayfields['cf.note_private']['checked'])) { - print ''; - print dol_string_nohtmltag($obj->note_private); + print ''; + print dolPrintHTML($obj->note_private); print ''; if (!$i) { $totalarray['nbfield']++;