From 9aea82817e8fe63338c88b565d690f25255d8de1 Mon Sep 17 00:00:00 2001
From: Regis Houssin <regis@dolibarr.fr>
Date: Mon, 17 Dec 2007 03:13:48 +0000
Subject: [PATCH] Fix: sigle euro non reconnu par fpdf et ajout de balise html
 dans la fonction dol_textishtml

---
 htdocs/includes/fpdf/fpdf/fpdf.php | 1 +
 htdocs/lib/functions.inc.php       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/htdocs/includes/fpdf/fpdf/fpdf.php b/htdocs/includes/fpdf/fpdf/fpdf.php
index 67ca0c3c0dc..377a30aa708 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('&ndash;','-',$element); //remplace les &ndash; par un tiret
 				$element = ereg_replace('&rsquo;','\'',$element); //remplace les &rsquo; par un apostrophe
 				$element = ereg_replace('&quot;','"',$element); //remplace les &quot; par une guillemet
+				$element = ereg_replace('&euro;','�',$element); //remplace les &euro; 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 4909b502d6a..23aefbddbc6 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;
 	}
-- 
GitLab