Index: nodequeue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v
retrieving revision 1.63
diff -u -p -r1.63 nodequeue.module
--- nodequeue.module	6 Oct 2008 16:28:22 -0000	1.63
+++ nodequeue.module	13 Nov 2008 02:20:12 -0000
@@ -1193,10 +1193,8 @@ function nodequeue_arrange_subqueue_form
     }
 
     foreach ($order as $new_pos => $old_pos) {
-      if ($sql) {
-        $sql .= ', ';
-      }
-      $sql .= ' (%d, %d, %d, %d, %d)';
+      $sql = ' (%d, %d, %d, %d, %d)';
+      $args = array();
       $args[] = $form_state['values']['sqid'];
       $args[] = $form_state['values']['qid'];
       $args[] = $nids[$old_pos];
@@ -1205,9 +1203,9 @@ function nodequeue_arrange_subqueue_form
       $args[] = $new_pos + 1;
       $args[] = $now;
       $subqueue->count++;
+      $sql = "INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES $sql";
+      db_query($sql, $args);
     }
-    $sql = "INSERT INTO {nodequeue_nodes} (sqid, qid, nid, position, timestamp) VALUES $sql";
-    db_query($sql, $args);
     if ($queue->size) {
         // 0 means infinity so never do this if false
         nodequeue_check_subqueue_size($queue, $subqueue);
@@ -1709,7 +1707,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:
@@ -1782,7 +1780,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.
@@ -1833,7 +1831,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.qid, s.sqid, 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.qid IN (". db_placeholders($qids, 'int') .") GROUP BY s.qid, s.sqid, s.reference, s.title";
   if ($page_size) {
     $result = pager_query($query, $page_size, 0, $qids);
   }
@@ -1897,7 +1895,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;