From c8d75c5837e2e9d9bc0e91d1cc03129c508c67ce Mon Sep 17 00:00:00 2001 From: Florent Bruneau Date: Fri, 26 Feb 2010 22:38:43 +0100 Subject: [PATCH] Fix remaining #x4dat#s. Signed-off-by: Florent Bruneau --- modules/xnetevents/xnetevents.inc.php | 4 ++-- modules/xnetgrp.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/xnetevents/xnetevents.inc.php b/modules/xnetevents/xnetevents.inc.php index 4d61bf3..07183d5 100644 --- a/modules/xnetevents/xnetevents.inc.php +++ b/modules/xnetevents/xnetevents.inc.php @@ -37,8 +37,8 @@ function get_event_detail($eid, $item_id = false, $asso_id = null) FROM group_events AS e INNER JOIN group_event_items AS ei ON (e.eid = ei.eid) LEFT JOIN group_event_participants AS ep ON(e.eid = ep.eid AND ei.item_id = ep.item_id) - LEFT JOIN #x4dat#.virtual AS al ON(al.type = \'evt\' AND al.alias = CONCAT(short_name, {?})) - LEFT JOIN #x4dat#.virtual AS pl ON(pl.type = \'evt\' AND pl.alias = CONCAT(short_name, {?})) + LEFT JOIN virtual AS al ON(al.type = \'evt\' AND al.alias = CONCAT(short_name, {?})) + LEFT JOIN virtual AS pl ON(pl.type = \'evt\' AND pl.alias = CONCAT(short_name, {?})) WHERE (e.eid = {?} OR e.short_name = {?}) AND ei.item_id = {?} AND e.asso_id = {?} GROUP BY ei.item_id', '-absents@'.$globals->xnet->evts_domain, diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php index 2ab86db..cb91306 100644 --- a/modules/xnetgrp.php +++ b/modules/xnetgrp.php @@ -532,7 +532,7 @@ class XnetGrpModule extends PLModule $it = XDB::iterator('SELECT s.uid, a.hruid, s.ts AS date FROM group_member_sub_requests AS s - INNER JOIN #x4dat#.accounts AS a ON(s.uid = a.uid) + INNER JOIN accounts AS a ON(s.uid = a.uid) WHERE s.asso_id = {?} ORDER BY s.ts', $globals->asso('id')); $page->changeTpl('xnetgrp/subscribe-valid.tpl'); -- 2.1.4