Skip to content
Snippets Groups Projects
Commit 62f12fec authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Merge pull request #2614 from FHenry/3.7 

Remove debug
parents e508b28d 32e067c8
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
htdocs/core/lib/functions.lib.php
+ 1
− 1
View file @ 62f12fec
...@@ -3787,7 +3787,7 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$ ...@@ -3787,7 +3787,7 @@ function dol_htmlentitiesbr($stringtoencode,$nl2brmode=0,$pagecodefrom='UTF-8',$
$newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"')); $newstring=strtr($newstring,array('__and__'=>'&','__lt__'=>'<','__gt__'=>'>','__dquot__'=>'"'));
} }
else else
{print 'eee'; {
if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring); // Remove last \n (may remove several) if ($removelasteolbr) $newstring=preg_replace('/(\r\n|\r|\n)$/i','',$newstring); // Remove last \n (may remove several)
$newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode); $newstring=dol_nl2br(dol_htmlentities($newstring,ENT_COMPAT,$pagecodefrom),$nl2brmode);
} }
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment