Only display name when using name in moderation email.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index 516f019..fe40261 100644 (file)
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -27,6 +27,7 @@ function smarty_function_profile($params, $smarty)
     $with_link  = $params->b('link', true);
     $with_dir   = $params->b('directory', true);
     $with_groupperms = $params->b('groupperms', true);
+    $raw = $params->b('raw', true);
     $user = $params->v('user');
     if (is_int($user) || ctype_digit($user)) {
         $user = User::getWithUID($user);
@@ -37,15 +38,19 @@ function smarty_function_profile($params, $smarty)
     } else {
         $name = pl_entities($user->fullName());
     }
-    if ($with_sex && $user->isFemale()) {
-        $name = '•' . $name;
-    }
     if ($with_promo) {
         $promo = $user->category();
         if ($promo) {
             $name .= ' (' . pl_entities($promo) . ')';
         }
     }
+    if ($raw) {
+        return $name;
+    }
+
+    if ($with_sex && $user->isFemale()) {
+        $name = '•' . $name;
+    }
     if ($with_link) {
         $profile = ($user instanceof Profile) ? $user : $user->profile();
         if ($profile) {

diff --git a/templates/lists/moderate_mail.tpl b/templates/lists/moderate_mail.tpl
index 94ef8cf..8b8eeae 100644 (file)
--- a/templates/lists/moderate_mail.tpl
+++ b/templates/lists/moderate_mail.tpl
@@ -35,7 +35,7 @@
       <td>raison (pour les refus)&nbsp;:
         <textarea cols='50' rows='10' name='reason' id='raison'>
 -- 
-{profile user=$smarty.session.user promo=true directory=false link=false sex=false}
+{profile user=$smarty.session.user promo=true directory=false link=false sex=false raw=true}
 </textarea>
       </td>
     </tr>