changed dol_htmlentities() parameters to match standard htmlentities()

This commit is contained in:
Cédric Salvador 2013-09-18 11:59:51 +02:00
parent 0b09493ecb
commit 9fdac2aa8e

View File

@ -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;
}