X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents%2Ffeed.inc.php;h=9e1298c20ee7cea97dacbec848da1235bc40843c;hb=b66dc2be115ea07ed7ee09d0fb1280236483702a;hp=524ff32d73c43d0c5456870587a2fc2d9546fdca;hpb=f280f651c1ea4059896655b132ddaec1e39cbd1b;p=platal.git

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 524ff32..9e1298c 100644
--- a/modules/events/feed.inc.php
+++ b/modules/events/feed.inc.php
@@ -50,10 +50,10 @@ class EventFeed extends PlFeed
                                          e.uid, e.promo_min, e.promo_max
                                    FROM  announces       AS e
                               LEFT JOIN  announce_photos AS p ON (p.eid = e.id)
-                                  WHERE  FIND_IN_SET("valide", e.flags) AND peremption >= NOW()');
+                                  WHERE  FIND_IN_SET("valide", e.flags) AND expiration >= NOW()');
         $data = array();
         while ($e = self::nextEvent($events, $user)) {
-            $author = User::getWithUID($e['user_id']);
+            $author = User::getWithUID($e['uid']);
             $promo  = $author->promo();
             $e['author'] = $author->fullName() . ($promo ? ' (' . $promo . ')' : '');
             $e['link'] = $globals->baseurl . '/events#newsid' . $e['id'];