lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into 16.0

Browse Source
This commit is contained in:
Laurent Destailleur 2022-09-11 22:17:41 +02:00
commit 90a42b23b3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/core/lib/functions.lib.php
View File

@ -1448,9 +1448,9 @@ function dol_escape_htmltag($stringtoescape, $keepb = 0, $keepn = 0, $noescapeta
// escape quotes and backslashes, newlines, etc. // escape quotes and backslashes, newlines, etc.
if ($escapeonlyhtmltags) { if ($escapeonlyhtmltags) {
$tmp = htmlspecialchars_decode($stringtoescape, ENT_COMPAT); $tmp = htmlspecialchars_decode((string) $stringtoescape, ENT_COMPAT);
} else { } else {
$tmp = html_entity_decode($stringtoescape, ENT_COMPAT, 'UTF-8'); $tmp = html_entity_decode((string) $stringtoescape, ENT_COMPAT, 'UTF-8');
} }
if (!$keepb) { if (!$keepb) {
$tmp = strtr($tmp, array("<b>"=>'', '</b>'=>'')); $tmp = strtr($tmp, array("<b>"=>'', '</b>'=>''));