Index: queue.module =================================================================== RCS file: /var/cvs/mydrupal/modules/queue.module,v retrieving revision 1.2.2.2 diff -u -r1.2.2.2 queue.module --- queue.module 20 Apr 2005 10:48:46 -0000 1.2.2.2 +++ queue.module 22 Apr 2005 23:24:29 -0000 @@ -123,9 +123,9 @@ $header = array(array('data' => t('Subject')), array('data' => t('Author')), array('data' => t('Type')), array('data' => t('Score'))); - $sql = 'SELECT n.nid, n.title, n.type, u.name, u.uid, SUM(IF(q.uid = %d, 1, 0)) AS voted, SUM(q.vote) AS score FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1 GROUP BY n.nid, n.title, n.type, u.name, u.uid, q.uid, q.vote'; + $sql = 'SELECT n.nid, n.title, n.type, u.name, u.uid, SUM(IF(q.uid = %d, 1, 0)) AS voted, SUM(q.vote) AS score FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1 GROUP BY n.nid, n.title, n.type, u.name, u.uid'; $sql = db_rewrite_sql($sql); - $sql_count = db_rewrite_sql('SELECT COUNT(n.nid) FROM {node} n INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1'); + $sql_count = db_rewrite_sql('SELECT COUNT(n.nid) FROM {node} n WHERE n.moderate = 1'); $result = pager_query($sql, 10, 0, $sql_count, $user->uid); while ($node = db_fetch_object($result)) { @@ -235,7 +235,7 @@ else { $id = arg(2); } - $node = node_load(array('nid' => $id)); + $node = node_load(array('type' => $id)); if (($user->uid == $node->uid || isset($node->voters[$user->uid])) && $node->moderate == 1) { foreach ($node->voters as $uid => $vote) { $account = user_load(array('uid' => $uid));