--- nodequeue.module.orig	2008-07-29 16:54:56.000000000 -0400
+++ nodequeue.module	2008-08-01 11:13:12.000000000 -0400
@@ -1,5 +1,5 @@
 <?php
-// $Id: nodequeue.module,v 1.52 2008/06/09 18:00:59 merlinofchaos Exp $
+// $Id: nodequeue.module,v 1.51 2008/05/30 18:41:50 merlinofchaos Exp $
 
 // --------------------------------------------------------------------------
 // Drupal Hooks
@@ -1551,7 +1551,7 @@ function nodequeue_get_qids($type, $acco
       $roles_join = "INNER JOIN {nodequeue_roles} nr ON nr.qid = nq.qid ";
       $roles = array_keys((array) $account->roles) + array(DRUPAL_AUTHENTICATED_RID);
 
-      $roles_where .= "AND nr.rid IN (". db_placeholders($role_args, 'int') .")";
+      $roles_where .= "AND nr.rid IN (". db_placeholders($roles, 'int') .")";
     }
 
     $sql = 'SELECT nq.qid, nq.show_in_tab, nq.show_in_links, show_in_ui '.
@@ -1629,7 +1629,7 @@ function nodequeue_load_queues($qids) {
 
   if (!empty($to_load)) {
     $placeholders = db_placeholders($to_load, 'int');
-    $result = db_query("SELECT q.*, COUNT(s.sqid) AS subqueues FROM {nodequeue_queue} q LEFT JOIN {nodequeue_subqueue} s ON q.qid = s.qid WHERE q.qid IN ($placeholders) GROUP BY q.qid", $to_load);
+    $result = db_query("SELECT q.qid, q.title, q.subqueue_title, q.size, q.link, q.link_remove, q.owner, q.show_in_ui, q.show_in_links, q.reference, q.reverse, COUNT(s.sqid) AS subqueues FROM {nodequeue_queue} q LEFT JOIN {nodequeue_subqueue} s ON q.qid = s.qid WHERE q.qid IN ($placeholders) GROUP BY q.qid, q.title, q.subqueue_title, q.size, q.link, q.link_remove, q.owner, q.show_in_ui, q.show_in_links, q.reference, q.reverse", $to_load);
     while ($queue = db_fetch_object($result)) {
       $cache[$queue->qid] = $queue;
       // ensure valid defaults:
@@ -1692,7 +1692,7 @@ function nodequeue_load_subqueues($sqids
   if (!empty($to_load)) {
     $placeholders = db_placeholders($to_load, 'int');
 
-    $result = db_query("SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.sqid IN ($placeholders) GROUP BY s.sqid", $to_load);
+    $result = db_query("SELECT s.sqid, s.qid, s.reference, s.title, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.sqid IN ($placeholders) GROUP BY s.sqid, s.qid, s.reference, s.title", $to_load);
     while ($obj = db_fetch_object($result)) {
       // Sometimes we want to get to subqueues by reference, sometimes by sqid.
       // sqid is always unique, but reference is sometimes more readily available.
@@ -1743,7 +1743,7 @@ function nodequeue_load_subqueues_by_que
     return array();
   }
 
-  $query = "SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.qid IN (". db_placeholders($qids, 'int') .") GROUP BY s.sqid";
+  $query = "SELECT s.sqid, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE s.qid IN (". db_placeholders($qids, 'int') .") GROUP BY s.sqid";
   if ($page_size) {
     $result = pager_query($query, $page_size, 0, $qids);
   }
@@ -1807,7 +1807,7 @@ function nodequeue_load_subqueues_by_ref
       $where .= 's.qid = %d AND s.reference IN ('. implode(', ', $key_list) .')';
     }
 
-    $result = db_query("SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE $where GROUP BY s.sqid", $values);
+    $result = db_query("SELECT s.sqid, s.qid, s.reference, s.title, COUNT(n.position) AS count FROM {nodequeue_subqueue} s LEFT JOIN {nodequeue_nodes} n ON n.sqid = s.sqid WHERE $where GROUP BY s.sqid, s.qid, s.reference, s.title", $values);
 
     while ($subqueue = db_fetch_object($result)) {
       $cache[$subqueue->qid][$subqueue->reference] = $subqueues[$subqueue->sqid] = $subqueue;
@@ -2537,3 +2537,4 @@ function nodequeue_get_token($nid) {
 function nodequeue_check_token($seed) {
   return drupal_get_token($seed) == $_GET['token'];
 }
+