diff --git a/htdocs/adherents/class/adherent.class.php b/htdocs/adherents/class/adherent.class.php index 733e8cfdf749a5f5e8852017b732142dba030e22..f6be9c028075bf0c3dfb05f90ea757b0f382acad 100644 --- a/htdocs/adherents/class/adherent.class.php +++ b/htdocs/adherents/class/adherent.class.php @@ -1500,11 +1500,12 @@ class Adherent extends CommonObject */ function getCivilityLabel() { - global $langs; - $langs->load("dict"); - - $code=$this->civilite_id; - return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code); + global $langs; + $langs->load("dict"); + + $code=(! empty($this->civilite_id)?$this->civilite_id:(! empty($this->civility_id)?$this->civility_id:'')); + if (empty($code)) return ''; + return $langs->getLabelFromKey($this->db, "Civility".$code, "c_civilite", "code", "civilite", $code); } /**