From e7c5ebf539641184096ff7e9417d7f0a665fb024 Mon Sep 17 00:00:00 2001
From: x2000chevalier <x2000chevalier>
Date: Sun, 10 Oct 2004 08:57:55 +0000
Subject: [PATCH] =?utf8?q?mise=20en=20avant=20du=20nom=20d'=E9pouse?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 htdocs/fiche.php    | 7 +++++--
 templates/fiche.tpl | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/htdocs/fiche.php b/htdocs/fiche.php
index 83a44df..26c4dfb 100644
--- a/htdocs/fiche.php
+++ b/htdocs/fiche.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.php,v 1.13 2004-10-10 08:38:59 x2000chevalier Exp $
+        $Id: fiche.php,v 1.14 2004-10-10 08:57:55 x2000chevalier Exp $
  ***************************************************************************/
 
 
@@ -87,7 +87,10 @@ $page->assign('mobile', $mobile);
 $page->assign('web', $web);
 $page->assign('libre', $libre);
 
-$page->assign('xorg_title', "$prenom $nom");
+if (empty($epouse))
+	$page->assign('xorg_title', "$prenom $nom");
+else
+	$page->assign('xorg_title', "$prenom $epouse");
 
 
 // reformatage is_contact
diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 4607fdc..0b1f331 100644
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.tpl,v 1.13 2004-10-10 08:38:58 x2000chevalier Exp $
+        $Id: fiche.tpl,v 1.14 2004-10-10 08:57:56 x2000chevalier Exp $
  ***************************************************************************}
 
 
@@ -25,7 +25,7 @@
 <div id="fiche">
 
 <div id="fiche_identite">
-  <div class="civilite">{$prenom} {$nom}
+  <div class="civilite">{$prenom} {if $epouse eq ""}{$nom}{else}{$epouse} ({$nom}){/if}
     <a href="vcard.php/{$forlife}.vcf?x={$user_id}"><img src="images/vcard.png" alt="Afficher la carte de visite" /></a>&nbsp;
     {if !$is_contact}
     <a href="javascript:x()"  onclick="popWin('mescontacts.php?action=ajouter&amp;user={$forlife}')"><img src="images/ajouter.gif" alt="Ajouter parmi mes contacts" /></a>&nbsp;
-- 
2.1.4