--- cmf.module 2009-04-14 14:00:44.000000000 +0200 +++ cmf.module.modified 2009-04-14 14:01:55.000000000 +0200 @@ -503,8 +503,7 @@ function cmf_perform_query($header, $kin switch ($kind) { case 'node': - return pager_query(' - SELECT n.nid, n.title, n.type, u.name AS username, u.uid, n.status, n.created, n.changed + return pager_query('SELECT n.nid, n.title, n.type, u.name AS username, u.uid, n.status, n.created, n.changed FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '. $filter['join'] . $filter['where'] . tablesort_sql($header), @@ -512,8 +511,7 @@ function cmf_perform_query($header, $kin ); break; case 'comment': - return pager_query(' - SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, c.status, c.name, + return pager_query('SELECT c.cid, c.subject, c.nid, c.comment, c.timestamp AS created, c.status, c.name, c.homepage, u.name AS username, u.uid, n.type FROM {comments} c INNER JOIN {node} n ON c.nid = n.nid INNER JOIN {users} u ON u.uid = c.uid '. $filter['join'] . @@ -524,8 +522,7 @@ function cmf_perform_query($header, $kin break; case 'both': $args = array_merge($filter['args'], $filter['args']); - return pager_query(' - SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, u.name AS username, u.uid, + return pager_query('SELECT 0 AS cid, n.nid, n.title, NULL AS comment, n.type, u.name AS username, u.uid, n.status, n.created, n.changed FROM {node} n INNER JOIN {users} u ON n.uid = u.uid '. $filter['join'] . $filter['where'] .'