X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=include%2Fnotifs.inc.php;h=19a64809f0a5c88576afbae4ed59207ded49c91d;hb=3424387cde6c635ff16c3b5459c4caa88bb76e2e;hp=088c4a1d30e2b266e7cac1127fb2126a7a16348a;hpb=5289c142e04219cb8e846c86ccd9f5005d7d49e1;p=platal.git

diff --git a/include/notifs.inc.php b/include/notifs.inc.php
index 088c4a1..19a6480 100644
--- a/include/notifs.inc.php
+++ b/include/notifs.inc.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   *
@@ -198,6 +198,7 @@ class WatchBirthday extends WatchOperation
 
     protected function buildCondition(Watch $watch)
     {
+        $not_dead = new PFC_Not(new UFC_Dead());
         $select_date = new PFC_OR(new UFC_Birthday('=', time()),
                                   new PFC_And(new UFC_Birthday('<=', time() + self::WATCH_LIMIT),
                                               new UFC_Birthday('>', $watch->date() + self::WATCH_LIMIT)));
@@ -210,7 +211,7 @@ class WatchBirthday extends WatchOperation
                                            new UFC_Promo('<=', $profile->mainGrade(), $profile->yearpromo() + 1)),
                                $watch->groupCondition());
         }
-        return new PFC_And($select_date, $cond);
+        return new PFC_And($not_dead, $select_date, $cond);
     }
 
     public function getOrder()
@@ -383,5 +384,5 @@ class Watch
     }
 }
 
-// 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:
 ?>