Index: nodequeue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v
retrieving revision 1.35
diff -u -p -r1.35 nodequeue.module
--- nodequeue.module	1 Aug 2006 23:47:43 -0000	1.35
+++ nodequeue.module	2 Aug 2006 01:29:26 -0000
@@ -701,20 +701,19 @@ function nodequeue_node_titles($qid, $ti
   return node_title_list($result, $title);
 }
 
-function nodequeue_nodes($qid, $backward = true, $teaser = true, $links = true, $from = 0, $count = 0) {
+function nodequeue_nodes($qid, $backward = true, $teaser = true, $links = true, $count = 0) {
   $orderby = ($backward ? "DESC" : "ASC");
-  $sql = db_rewrite_sql("SELECT n.nid FROM {node} n INNER JOIN {nodequeue_nodes} nn ON n.nid = nn.nid WHERE nn.qid = %d AND n.status = 1 ORDER BY nn.position $orderby");
-  if ($count) {
-    $result = db_query_range($sql, $qid, $from, $count);
-  }
-  else {
-    $result = db_query($sql, $qid);
-  }
+  $sql = db_rewrite_sql("SELECT n.nid, nq.* FROM {node} n INNER JOIN {nodequeue_nodes} nn ON n.nid = nn.nid INNER JOIN {nodequeue_queue} nq ON nn.qid = nq.qid WHERE nn.qid = %d AND n.status = 1 ORDER BY nn.position $orderby");
+  $result = pager_query($sql, $count ? $count : variable_get('default_nodes_main', 10), 0, NULL, $qid);
 
   while ($nid = db_fetch_object($result)) {
     $node = node_load($nid->nid);
     $output .= node_view($node, $teaser, false, $links);
   }
+  if ($nid->size == 0) {
+    $output .= theme('pager', NULL, $count ? $count : variable_get('default_nodes_main', 10));
+  }
+
   return $output;
 }