Merge commit 'origin/fusionax' into account

[platal.git] / modules / events.php

diff --git a/modules/events.php b/modules/events.php
index 4a106e1..19ca0fd 100644 (file)
--- a/modules/events.php
+++ b/modules/events.php
@@ -133,9 +133,9 @@ class EventsModule extends PLModule
         $page->assign('geoloc_incitation', count($res));
 
         // Direct link to the RSS feed, when available.
-        if (S::rssActivated()) {
+        if (S::hasAuthToken()) {
             $page->setRssLink('Polytechnique.org :: News',
-                              '/rss/'.S::v('hruid') .'/'.S::v('core_rss_hash').'/rss.xml');
+                              '/rss/'.S::v('hruid') .'/'.S::v('token').'/rss.xml');
         }
 
         // Hide the read event, and reload the page to get to the next event.
@@ -159,7 +159,7 @@ class EventsModule extends PLModule
 
         // Fetch the events to display, along with their metadata.
         $array = array();
-        $it = XDB::iterator("SELECT  e.id, e.titre, e.texte, e.post_id, a.user_id, a.nom, a.prenom, d.promo_display ,a.hruid,
+        $it = XDB::iterator("SELECT  e.id, e.titre, e.texte, e.post_id, a.user_id, a.nom, a.prenom, d.promo AS promo_display ,a.hruid,
                                      p.x, p.y, p.attach IS NOT NULL AS img, FIND_IN_SET('wiki', e.flags) AS wiki,
                                      FIND_IN_SET('important', e.flags) AS important,
                                      e.creation_date > DATE_SUB(CURDATE(), INTERVAL 2 DAY) AS news,
@@ -168,7 +168,7 @@ class EventsModule extends PLModule
                                FROM  evenements       AS e
                           LEFT JOIN  evenements_photo AS p  ON (e.id = p.eid)
                          INNER JOIN  auth_user_md5    AS a  ON (e.user_id = a.user_id)
-                         INNER JOIN  profile_display  AS d  ON (d.uid = a.user_id)
+                         INNER JOIN  profile_display  AS d  ON (d.pid = a.user_id)
                           LEFT JOIN  evenements_vus   AS ev ON (e.id = ev.evt_id AND ev.user_id = {?})
                               WHERE  FIND_IN_SET('valide', e.flags) AND peremption >= NOW()
                                      AND (e.promo_min = 0 || e.promo_min <= {?})