diff --git a/htdocs/includes/fpdf/fpdf/fpdf.php b/htdocs/includes/fpdf/fpdf/fpdf.php index 67ca0c3c0dcfac5afdb0fb0389c968d259fe6273..377a30aa708a0d31a187b79e9ed422eefe3e12fb 100644 --- a/htdocs/includes/fpdf/fpdf/fpdf.php +++ b/htdocs/includes/fpdf/fpdf/fpdf.php @@ -1921,6 +1921,7 @@ function _out($s) $element = ereg_replace('–','-',$element); //remplace les – par un tiret $element = ereg_replace('’','\'',$element); //remplace les ’ par un apostrophe $element = ereg_replace('"','"',$element); //remplace les " par une guillemet + $element = ereg_replace('€','�',$element); //remplace les € par le signe � if (!preg_match($pattern, $element)) { //Text if($this->HREF) { diff --git a/htdocs/lib/functions.inc.php b/htdocs/lib/functions.inc.php index 4909b502d6aba0130a2f64b6b13045532ee9216f..23aefbddbc68da2249d549152f166c3e48f8f47a 100644 --- a/htdocs/lib/functions.inc.php +++ b/htdocs/lib/functions.inc.php @@ -3291,6 +3291,8 @@ function dol_textishtml($msg,$option=0) elseif (eregi('<font',$msg)) return true; elseif (eregi('<strong',$msg)) return true; elseif (eregi('<img',$msg)) return true; + elseif (eregi('<i>',$msg)) return true; + elseif (eregi('<b>',$msg)) return true; elseif (eregi('&[A-Z0-9]{1,6};',$msg)) return true; return false; }