From 9fdac2aa8e9df021e1d992e1b05dd122f4c0a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Salvador?= Date: Wed, 18 Sep 2013 11:59:51 +0200 Subject: [PATCH] changed dol_htmlentities() parameters to match standard htmlentities() --- htdocs/core/lib/functions.lib.php | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index b509c41666a..7e7577f9f3d 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3478,16 +3478,17 @@ function dol_html_entity_decode($a,$b,$c='UTF-8') /** * Replace htmlentities functions to manage errors + * http://php.net/manual/en/function.htmlentities.php * - * @param string $a Operand a - * @param string $b Operand b - * @param string $c Operand c - * @return string String encoded + * @param string $string The input string. + * @param int $flags + * @param string $encoding + * @return bool $double_encode When double_encode is turned off PHP will not encode existing html entities */ -function dol_htmlentities($a,$b,$c='UTF-8') +function dol_htmlentities($string, $flags=null, $encoding='UTF-8', $double_encode=false) { // We use @ to avoid warning on PHP4 that does not support entity decoding to UTF8; - $ret=@htmlentities($a,$b,$c); + $ret=@htmlentities($string, $flags, $encoding, $double_encode); return $ret; }