--- nodequeue.module	2006-11-29 12:43:20.000000000 -0700
+++ nodequeue.module.gjk	2007-01-04 14:56:27.671875000 -0700
@@ -128,7 +128,7 @@ function nodequeue_page_form($node) {
     "INNER JOIN {nodequeue_types} nt ON nt.qid = nq.qid " .
     "LEFT JOIN {nodequeue_nodes} nqn ON nqn.qid = nq.qid " . $roles_join .
     "WHERE nt.type = '%s' " . $roles_where .
-    "GROUP BY nq.qid  ORDER BY nq.title", 'nq', 'qid'), $node->type);
+    "GROUP BY nq.qid  ORDER BY nq.title", 'nq', 'qid'), array_merge($node->type,$roles));
 
   $form = array();
   while ($queue = db_fetch_object($result)) {
@@ -446,7 +446,7 @@ function nodequeue_node_access($type) {
   $sql = 'SELECT nq.qid FROM {nodequeue_queue} nq ' .
     'INNER JOIN {nodequeue_types} nt ON nt.qid = nq.qid ' . $roles_join .
     "WHERE nt.type = '%s' " . $roles_where;
-  $result = db_query($sql, $type);
+  $result = db_query($sql, array_merge($type, $roles));
 
   return db_num_rows($result);
 }