From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Wed, 23 Jun 2010 07:58:16 +0000 (+0200)
Subject: Fix encoding issues in addresses in the pdf of the contacts. (Closes #1108)
X-Git-Tag: xorg/1.0.0~78
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=504510436bafa8e53c678cc875570b19db74e495;p=platal.git

Fix encoding issues in addresses in the pdf of the contacts. (Closes #1108)

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---

diff --git a/modules/carnet/contacts.pdf.inc.php b/modules/carnet/contacts.pdf.inc.php
index 09ed3b4..2ceea8d 100644
--- a/modules/carnet/contacts.pdf.inc.php
+++ b/modules/carnet/contacts.pdf.inc.php
@@ -187,12 +187,7 @@ class ContactsPDF extends FPDF
             $l .= 'principale';
         }
 
-        $r = utf8_decode($a->text);
-/*        $r = trim("$r\n".$a['adr1']);
-        $r = trim("$r\n".$a['adr2']);
-        $r = trim("$r\n".$a['adr3']);
-        $r = trim("$r\n".trim($a['postcode'].' '.$a['city']));
-*/
+        $r = $a->text;
         $this->TableRow($l, $r);
 /*
         if (!empty($a['tels'])) {