From 676011e1bd350ad436239d9e4290c0141fe41fb8 Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Thu, 5 Jan 2012 00:23:43 +0100
Subject: [PATCH] Fix: Country must be not encoded into memory
---
htdocs/adherents/class/adherent.class.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php
index 30505903f1d..244418e2fb1 100644
--- a/htdocs/adherents/class/adherent.class.php
+++ b/htdocs/adherents/class/adherent.class.php
@@ -1026,10 +1026,9 @@ class Adherent extends CommonObject
$this->country_code = $obj->country_code;
$this->pays_id = $obj->country_id; // TODO deprecated
$this->pays_code = $obj->country_code; // TODO deprecated
- if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) $this->country = $langs->trans("Country".$obj->country_code);
- elseif ($obj->country) $this->country=$obj->country;
+ if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) $this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
else $this->country=$obj->country;
- $this->pays = $this->country;
+ $this->pays = $this->country; // TODO deprecated
$this->phone = $obj->phone;
$this->phone_perso = $obj->phone_perso;
--
GitLab