diff --git a/htdocs/lib/functions.lib.php b/htdocs/lib/functions.lib.php index 52d3d30ea9b..7f89ad17019 100644 --- a/htdocs/lib/functions.lib.php +++ b/htdocs/lib/functions.lib.php @@ -3064,10 +3064,7 @@ function dol_nl2br($stringtoencode,$nl2brmode=0,$forxml=false) } else { - $ret=str_replace("\r","",$stringtoencode); - $ret=str_replace("\n",($forxml?'
':'
'),$ret); - //$ret=preg_replace('/(
||)\s*(\r\n|\r|\n)+/i',($forxml?'
':'
'),$stringtoencode); - //$ret=preg_replace('/([^]+)(\r\n|\r|\n)+/i',($forxml?'$1
':'$1
'),$ret); + $ret=preg_replace('/(\r\n|\r|\n)/i',($forxml?'
':'
'),$stringtoencode); return $ret; } }