X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=plugins%2Ffunction.profile.php;h=fc7087fc61a02ad46a80b1aa2bbb42f4f3397a01;hb=3424387cde6c635ff16c3b5459c4caa88bb76e2e;hp=abfb165f2565eb6a078dfce4b4b4f7634eda8d2a;hpb=9169d55a5c9083b9ceadc7a385f262ed1b589280;p=platal.git

diff --git a/plugins/function.profile.php b/plugins/function.profile.php
index abfb165..fc7087f 100644
--- a/plugins/function.profile.php
+++ b/plugins/function.profile.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2011 Polytechnique.org                              *
+ *  Copyright (C) 2003-2014 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -29,6 +29,8 @@ function smarty_function_profile($params, $smarty)
     $with_groupperms = $params->b('groupperms', true);
     $raw = $params->b('raw', false);
     $user = $params->v('user');
+    $profile = $params->v('profile');
+
     if (is_int($user) || ctype_digit($user)) {
         $user = User::getWithUID($user);
     }
@@ -52,12 +54,17 @@ function smarty_function_profile($params, $smarty)
         $name = '&bull;' . $name;
     }
     if ($with_link) {
-        $profile = ($user instanceof Profile) ? $user : $user->profile();
+        if (is_null($profile)) {
+            $profile = $user->profile();
+        }
+
         if ($profile) {
             $name = '<a href="profile/' . $profile->hrid() . '" class="popup2">' . $name . '</a>';
         }
     }
-    if ($user->lost) {
+    if ($profile && $profile->isDead()) {
+        $name .= ' &dagger;';
+    } else if ($user->lost) {
         $name .= ' <a href="https://www.polytechnique.org/marketing/broken/' . $user->hruid . '"><img src="images/icons/error.gif" alt="Patte cassée" /></a>';
     }
     if ($with_groupperms && $user instanceof User && $user->group_perms == 'admin' && !empty($name)) {
@@ -66,5 +73,5 @@ function smarty_function_profile($params, $smarty)
     return $name;
 }
 
-// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker fenc=utf-8:
 ?>