1381c1381
<     $node_status_sql = ' AND (n.status = 1 || n.uid = %d)';
---
>     $node_status_sql = ' AND (n.status = 1 OR n.uid = %d)';
1384c1384
<   $query_restricted = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid) FROM {node} n LEFT JOIN {nodequeue_nodes} nq ON nq.nid = n.nid WHERE nq.sqid = %d $node_status_sql ORDER BY nq.position $order"), $sqid, $account->uid);
---
>   $query_restricted = db_query(db_rewrite_sql("SELECT DISTINCT(n.nid), nq.position FROM {node} n LEFT JOIN {nodequeue_nodes} nq ON nq.nid = n.nid WHERE nq.sqid = %d $node_status_sql ORDER BY nq.position $order"), $sqid, $account->uid);
1658c1658
<     $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.*, (SELECT count(*) FROM {nodequeue_subqueue} s WHERE s.qid = q.qid}) AS subqueues FROM {nodequeue_queue} q WHERE q.qid IN ($placeholders)", $to_load);
1742c1742
<     $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.*, (SELECT count(n.position) FROM {nodequeue_nodes} n WHERE n.sqid = s.sqid) AS count FROM {nodequeue_subqueue} s WHERE s.sqid IN ($placeholders)", $to_load);
1795c1795
<   $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.*, (SELECT count(n.position) FROM {nodequeue_nodes} n WHERE n.sqid = s.sqid) AS count FROM {nodequeue_subqueue} s WHERE s.qid IN (". db_placeholders($qids, 'int') .")";
1862c1862
<     $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.*, (SELECT COUNT(n.position) FROM {nodequeue_nodes} n WHERE n.sqid = s.sqid) AS count FROM {nodequeue_subqueue} s WHERE $where", $values);
2537c2537
<     $where = '(n.status = 1 || n.uid = %d) AND ';
---
>     $where = '(n.status = 1 OR n.uid = %d) AND ';