From f0aac521d080d5c60da998c0dc0391b1a53832fa Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Tue, 18 Jun 2013 23:28:03 +0200
Subject: [PATCH] Fix: civility label

---
 htdocs/contact/class/contact.class.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/htdocs/contact/class/contact.class.php b/htdocs/contact/class/contact.class.php
index fb1ce97fd01..f4409e27928 100644
--- a/htdocs/contact/class/contact.class.php
+++ b/htdocs/contact/class/contact.class.php
@@ -883,7 +883,8 @@ class Contact extends CommonObject
 		global $langs;
 		$langs->load("dict");
 
-		$code=$this->civilite_id;
+		$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);
 	}