Merge pull request #22225 from hregis/fix_avoid_warning
FIX avoid warning (php7+)
This commit is contained in:
commit
76ca76fd3d
@ -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>'=>''));
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user