Renames user_id to uid in groups related tables accordingly to our naming convention.

[platal.git] / modules / events / feed.inc.php

diff --git a/modules/events/feed.inc.php b/modules/events/feed.inc.php
index 802725c..524ff32 100644 (file)
--- a/modules/events/feed.inc.php
+++ b/modules/events/feed.inc.php
@@ -1,6 +1,6 @@
 <?php
 /***************************************************************************
- *  Copyright (C) 2003-2009 Polytechnique.org                              *
+ *  Copyright (C) 2003-2010 Polytechnique.org                              *
  *  http://opensource.polytechnique.org/                                   *
  *                                                                         *
  *  This program is free software; you can redistribute it and/or modify   *
@@ -47,9 +47,9 @@ 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)
+                                         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()');
         $data = array();
         while ($e = self::nextEvent($events, $user)) {