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

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 46de904..63ced8d 100644
--- a/modules/events/feed.inc.php
+++ b/modules/events/feed.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2010 Polytechnique.org                              *
+ *  Copyright (C) 2003-2011 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -31,7 +31,7 @@ class EventFeed extends PlFeed
                             'events/rss.tpl');
     }
 
-    public static function nextEvent(PlIterator &$it, PlUser &$user)
+    public static function nextEvent(PlIterator $it, PlUser $user)
     {
         while ($body = $it->next()) {
             $uf = UserFilter::getLegacy($body['promo_min'], $body['promo_max']);
@@ -42,18 +42,18 @@ class EventFeed extends PlFeed
         return null;
     }
 
-    protected function fetch(PlUser &$user)
+    protected function fetch(PlUser $user)
     {
         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'];