Skip to content
Snippets Groups Projects
Commit 676011e1 authored by Laurent Destailleur's avatar Laurent Destailleur
Browse files

Fix: Country must be not encoded into memory

parent 4523f178
Branches
Tags
No related merge requests found
...@@ -1026,10 +1026,9 @@ class Adherent extends CommonObject ...@@ -1026,10 +1026,9 @@ class Adherent extends CommonObject
$this->country_code = $obj->country_code; $this->country_code = $obj->country_code;
$this->pays_id = $obj->country_id; // TODO deprecated $this->pays_id = $obj->country_id; // TODO deprecated
$this->pays_code = $obj->country_code; // 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); if ($langs->trans("Country".$obj->country_code) != "Country".$obj->country_code) $this->country = $langs->transnoentitiesnoconv("Country".$obj->country_code);
elseif ($obj->country) $this->country=$obj->country;
else $this->country=$obj->country; else $this->country=$obj->country;
$this->pays = $this->country; $this->pays = $this->country; // TODO deprecated
$this->phone = $obj->phone; $this->phone = $obj->phone;
$this->phone_perso = $obj->phone_perso; $this->phone_perso = $obj->phone_perso;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment