X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=modules%2Fxnetgrp%2Ffeed.inc.php;h=88ba32aa4488275330dd6578ac6185903c725c60;hb=00112b2e8cd1e6e37d06135e6279380f7e2aaa73;hp=c367967ddba7e34d347d627b0614a0e0baf26aef;hpb=4f494e74bb1310de55ce335324a966e31b6c72cb;p=platal.git diff --git a/modules/xnetgrp/feed.inc.php b/modules/xnetgrp/feed.inc.php index c367967..88ba32a 100644 --- a/modules/xnetgrp/feed.inc.php +++ b/modules/xnetgrp/feed.inc.php @@ -42,10 +42,10 @@ class XnetGrpEventFeed extends PlFeed CONCAT(u2.prenom, ' ', IF(u2.nom_usage != '', u2.nom_usage, u2.nom), ' (X', u2.promo, ')') AS author, FIND_IN_SET('photo', a.flags) AS photo, CONCAT({?}, '/#art', a.id) AS link - FROM auth_user_md5 AS u - INNER JOIN groupex.announces AS a ON ( (a.promo_min = 0 OR a.promo_min <= u.promo) - AND (a.promo_max = 0 OR a.promo_max <= u.promo)) - INNER JOIN auth_user_md5 AS u2 ON (u2.user_id = a.user_id) + FROM #x4dat#.auth_user_md5 AS u + INNER JOIN #groupex#.announces AS a ON ((a.promo_min = 0 OR a.promo_min <= u.promo) + AND (a.promo_max = 0 OR a.promo_max <= u.promo)) + INNER JOIN #x4dat#.auth_user_md5 AS u2 ON (u2.user_id = a.user_id) WHERE u.user_id = {?} AND peremption >= NOW() AND a.asso_id = {?}", $this->link, $user->id(), $globals->asso('id')); } else { @@ -53,8 +53,8 @@ class XnetGrpEventFeed extends PlFeed CONCAT(u.prenom, ' ', IF(u.nom_usage != '', u.nom_usage, u.nom), ' (X', u.promo, ')') AS author, CONCAT({?}, '/#art', a.id) AS link, NULL AS photo, NULL AS contacts - FROM groupex.announces AS a - INNER JOIN auth_user_md5 AS u USING(user_id) + FROM #groupex#.announces AS a + INNER JOIN #x4dat#.auth_user_md5 AS u USING(user_id) WHERE FIND_IN_SET('public', a.flags) AND peremption >= NOW() AND a.asso_id = {?}", $this->link, $globals->asso('id')); }