Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-24 02:11:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: sigle euro non reconnu par fpdf et ajout de balise html dans la fonction dol_textishtml

Browse Source
This commit is contained in:
Regis Houssin
2007-12-17 03:13:48 +00:00
parent c46c0474ad
commit 9aea82817e
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/includes/fpdf/fpdf/fpdf.php
View File

@@ -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('&euro;','<27>',$element); //remplace les &euro; par le signe <20>
if (!preg_match($pattern, $element)) {
//Text
if($this->HREF) {

2
htdocs/lib/functions.inc.php
View File

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