Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ldestailleur
2025-08-21 15:40:32 +02:00
parent c389d40148 165272d0e1
commit 44ca0a7aff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2160,9 +2160,9 @@ function dolPrintText($s)
* To output a text inside an attribute, you can use dolPrintHTMLForAttribute() or dolPrintHTMLForTextArea() inside a textarea * To output a text inside an attribute, you can use dolPrintHTMLForAttribute() or dolPrintHTMLForTextArea() inside a textarea
* With dolPrintHTML(), only content not already in HTML is encoded with HTML. * With dolPrintHTML(), only content not already in HTML is encoded with HTML.
* *
* @param string $s String to print * @param int|float|string $s String to print
* @param int $allowiframe Allow iframe tags * @param int $allowiframe Allow iframe tags
* @return string String ready for HTML output (sanitized and escape) * @return string String ready for HTML output (sanitized and escape)
* @see dolPrintHTMLForAttribute(), dolPrintHTMLFortextArea(), dolPrintText() * @see dolPrintHTMLForAttribute(), dolPrintHTMLFortextArea(), dolPrintText()
*/ */
function dolPrintHTML($s, $allowiframe = 0) function dolPrintHTML($s, $allowiframe = 0)
@@ -2172,7 +2172,7 @@ function dolPrintHTML($s, $allowiframe = 0)
// dol_htmlentitiesbr encode all chars except "'" if string is not already HTML, but // dol_htmlentitiesbr encode all chars except "'" if string is not already HTML, but
// encode only special char like é but not &, <, >, ", ' if already HTML. // encode only special char like é but not &, <, >, ", ' if already HTML.
$stringWithEntitesForSpecialChar = dol_htmlentitiesbr($s); $stringWithEntitesForSpecialChar = dol_htmlentitiesbr((string) $s);
return dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags($stringWithEntitesForSpecialChar, 1, 1, 1, $allowiframe)), 1, 1, 'common', 0, 1); return dol_escape_htmltag(dol_htmlwithnojs(dol_string_onlythesehtmltags($stringWithEntitesForSpecialChar, 1, 1, 1, $allowiframe)), 1, 1, 'common', 0, 1);
} }