X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fevents%2Ffeed.inc.php;h=bc93fdeae0e9f65a2499e5e8b41264b4e808875d;hb=a1c554a92888e0b017ba362817a67cc2849a9154;hp=2d9b966289ff3b25dbc488034c52b804d3962910;hpb=06f4daf9ceb56712582d81330896848a1a262894;p=platal.git

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 2d9b966..bc93fde 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   *
@@ -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
+                                         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'];