Index: nodequeue.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v
retrieving revision 1.39.2.28.2.30
diff -u -F^f -r1.39.2.28.2.30 nodequeue.module
--- nodequeue.module	26 Feb 2008 19:27:54 -0000	1.39.2.28.2.30
+++ nodequeue.module	5 Apr 2008 16:54:29 -0000
@@ -2177,7 +2177,7 @@ function nodequeue_fetch_back($sqid, $te
 }
 
 function nodequeue_fetch_random($sqid, $teaser = true, $links = true) {
-  $count = db_result(db_query("SELECT count(*) FROM {nodequeue_nodes} WHERE sqid = %d", $sqid));
+  $count = db_result(db_query(db_rewrite_sql("SELECT COUNT(n.nid) FROM {node} n INNER JOIN {nodequeue_nodes} nn ON n.nid = nn.nid WHERE nn.sqid = %d AND n.status = 1"), $sqid));
   return nodequeue_nodes($sqid, false, $teaser, $links, rand(0, $count - 1), 1);
 }