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

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 46de904..9e1298c 100644
--- a/modules/events/feed.inc.php
+++ b/modules/events/feed.inc.php
@@ -47,13 +47,13 @@ class EventFeed extends PlFeed
         global $globals;
         $events = XDB::iterator('SELECT  e.id, e.titre AS title, e.texte, e.creation_date AS publication, e.post_id,
                                          p.attachmime IS NOT NULL AS photo, FIND_IN_SET(\'wiki\', e.flags) AS wiki,
-                                         e.user_id, e.promo_min, e.promo_max
-                                   FROM  evenements       AS e
-                              LEFT JOIN  evenements_photo AS p ON (p.eid = e.id)
-                                  WHERE  FIND_IN_SET("valide", e.flags) AND peremption >= NOW()');
+                                         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 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'];