From e019ea3dae21f3c0794b0277c1fe9cefaf7e1114 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Sat, 2 Oct 2010 12:35:36 +0200
Subject: [PATCH] Fix signature in moderation mail template.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 plugins/function.profile.php      | 7 ++++++-
 templates/lists/moderate_mail.tpl | 3 +--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index f3a7fb1..3a05b61 100644
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -25,13 +25,18 @@ function smarty_function_profile($params, &$smarty)
     $with_promo = $params->b('promo', false) || $params->b('cat', false);
     $with_sex   = $params->b('sex', true);
     $with_link  = $params->b('link', true);
+    $with_dir   = $params->b('directory', true);
     $with_groupperms = $params->b('groupperms', true);
     $user = $params->v('user');
     if (is_int($user) || ctype_digit($user)) {
         $user = User::getWithUID($user);
     }
 
-    $name = pl_entities($user->directoryName());
+    if ($with_dir) {
+        $name = pl_entities($user->directoryName());
+    } else {
+        $name = pl_entities($user->fullName());
+    }
     if ($with_sex && $user->isFemale()) {
         $name = '&bull;' . $name;
     }
diff --git a/templates/lists/moderate_mail.tpl b/templates/lists/moderate_mail.tpl
index b8a4cd7..d3bb82b 100644
--- a/templates/lists/moderate_mail.tpl
+++ b/templates/lists/moderate_mail.tpl
@@ -35,8 +35,7 @@
       <td>raison (pour les refus)&nbsp;:
         <textarea cols='50' rows='10' name='reason' id='raison'>
 -- 
-{assign var="profile" value=$smarty.session.user->profile()}
-{$smarty.session.prenom} {$smarty.session.nom} ({$profile->promo()})
+{profile user=$smarty.session.user promo=true directory=false link=false sex=false}
 </textarea>
       </td>
     </tr>
-- 
2.1.4