diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-12-27 11:46:48 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-12-27 11:46:48 +0000 |
| commit | 49f4123976bc7b855eee06f9088bbc0e3d8dc941 (patch) | |
| tree | 8dac5c2d4a97bc02022aecd871249dd9b107e322 | |
| parent | 05ede21745ed985524b6d9b85ec91f7b2628019a (diff) | |
| download | brdo-49f4123976bc7b855eee06f9088bbc0e3d8dc941.tar.gz brdo-49f4123976bc7b855eee06f9088bbc0e3d8dc941.tar.bz2 | |
- Fixed two SQL bugs in the queue.module. Fixes #14115.
| -rw-r--r-- | modules/queue.module | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/queue.module b/modules/queue.module index fc83af62e..46d4a6d71 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -123,8 +123,7 @@ function queue_overview() { $header = array(array('data' => t('Subject')), array('data' => t('Author')), array('data' => t('Type')), array('data' => t('Score'))); - $sresult = pager_query('SELECT DISTINCT(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 '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1 AND '. node_access_where_sql(), 10, 0, - 'SELECT DISTINCT(n.nid) FROM {node} n '. node_access_join_sql() .' WHERE n.moderate = 1 AND '. node_access_where_sql(), $user->uid); + $sresult = pager_query('SELECT DISTINCT(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 '. node_access_join_sql() .' INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1 AND '. node_access_where_sql() .' GROUP BY n.nid, n.title, n.type, u.name, u.uid, q.uid, q.vote', 10, 0, 'SELECT DISTINCT(n.nid) FROM {node} n '. node_access_join_sql() .' INNER JOIN {queue} q ON n.nid = q.nid WHERE n.moderate = 1 AND '. node_access_where_sql(), $user->uid); while ($node = db_fetch_object($sresult)) { if ($user->uid == $node->uid || $node->voted) { |