Index: nodequeue.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v retrieving revision 1.108 diff -u -r1.108 nodequeue.module --- nodequeue.module 7 Oct 2010 02:50:35 -0000 1.108 +++ nodequeue.module 21 Oct 2010 09:10:46 -0000 @@ -583,7 +583,7 @@ // Fetch all of the queues. $queues = nodequeue_load_queues(nodequeue_get_all_qids(25)); - + foreach ($queues as $queue) { if (!nodequeue_queue_access($queue)) { unset($queues[$queue->qid]); @@ -1058,7 +1058,7 @@ // get a list of all nodes in the subqueue, regardless of access restrictions $query = db_select('node', 'n') ->distinct(); - + $query->leftJoin('users', 'u', 'n.uid = u.uid'); $query->leftJoin('nodequeue_nodes', 'nq', 'nq.nid = n.nid'); $query->fields('n', array('nid', 'title', 'created')) @@ -1088,7 +1088,7 @@ $count = count($nodes); $form['nodes'] = array(); $form['nodes']['#theme'] = 'nodequeue_arrange_subqueue_form_table'; - + // Theme function needs these $form['nodes']['#queue'] = (array) $queue; $form['nodes']['#subqueue'] = (array) $subqueue; @@ -1717,7 +1717,7 @@ if (!empty($to_load)) { $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 (:to_load) GROUP BY q.qid", array(':to_load' => $to_load)); - + foreach ($result as $queue) { $loaded[$queue->qid] = $queue; // ensure valid defaults: @@ -1855,7 +1855,7 @@ return array(); } - $query = "SELECT s.*, COUNT(n.position) AS count FROM {nodequeue_subqueue} s + $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 (:qids) GROUP BY s.sqid"; $result = db_query($query, array(':qids' => $qids)); @@ -1891,7 +1891,7 @@ ->fields('s'); $query->leftJoin('nodequeue_nodes', 'n', 'n.sqid = s.sqid'); $query->addExpression('COUNT(n.position)', 'count'); - + $where = ''; foreach ($references as $qid => $reference) { if ($where) { @@ -1900,7 +1900,7 @@ $where .= 's.qid = :qid AND s.reference IN (:reference)'; $query->where($where, array(':qid' => $qid, ':reference' => $reference)); } - + $result = $query->execute(); foreach ($result as $subqueue) { @@ -1929,12 +1929,12 @@ 'reverse' => $queue->reverse, 'reference' => $queue->reference, ); - + if (!isset($queue->qid)) { $queue->qid = db_insert('nodequeue_queue') ->fields($nodequeue_queue_fields) ->execute(); - + if (function_exists('views_invalidate_cache')) { views_invalidate_cache(); } @@ -1948,7 +1948,7 @@ db_delete('nodequeue_roles') ->condition('qid', $queue->qid) ->execute(); - + db_delete('nodequeue_types') ->condition('qid', $queue->qid) ->execute(); @@ -2005,7 +2005,7 @@ db_delete('nodequeue_roles') ->condition('qid', $qid) ->execute(); - + db_delete('nodequeue_types') ->condition('qid', $qid) ->execute(); @@ -2045,7 +2045,7 @@ $subqueue->qid = $queue->qid; $subqueue->title = $title; - + $subqueue->sqid = db_insert('nodequeue_subqueue') ->fields(array( 'qid' => $queue->qid, @@ -2172,7 +2172,7 @@ } // Retrieve the nodes that are being removed. - $result = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position >= :start AND position <= :end", + $result = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position >= :start AND position <= :end", array( ':sqid' => $sqid, ':start' => $start, @@ -2192,7 +2192,7 @@ ->condition('sqid', $sqid) ->condition('position', $end, '>') ->execute(); - + // Invoke the hook to let other modules know that the nodes were removed. foreach ($result as $node) { module_invoke_all('nodequeue_remove', $sqid, $node->nid); @@ -2255,10 +2255,10 @@ */ function nodequeue_queue_swap($subqueue, $pos1, $pos2) { // Grab the nid off one of the positions so we can more easily swap. - $nid = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position = :position", + $nid = db_query("SELECT nid FROM {nodequeue_nodes} WHERE sqid = :sqid AND position = :position", array(':sqid' => $subqueue->sqid, ':position' => $pos1)) ->fetchField(); - + if (!$nid) { return; } @@ -2312,7 +2312,7 @@ ':position' => $position, )); $entry = $result->fetchObject(); - + db_delete('nodequeue_nodes') ->condition('sqid', $subqueue->sqid) ->condition('position', $position) @@ -2323,7 +2323,7 @@ ->condition('sqid', $subqueue->sqid) ->condition('position', $position, '<') ->execute(); - + db_insert('nodequeue_nodes') ->fields(array( 'qid' => $entry->qid, @@ -2332,7 +2332,7 @@ 'position' => 1, 'timestamp' => $entry->timestamp, )) - ->execute(); + ->execute(); } /** @@ -2342,13 +2342,13 @@ if ($position < 1 || $position >= $subqueue->count) { return; } - + $result = db_query("SELECT * FROM {nodequeue_nodes} WHERE sqid= :sqid AND position = :position", array( ':sqid' => $subqueue->sqid, ':position' => $position, )); $entry = $result->fetchObject(); - + db_delete('nodequeue_nodes') ->condition('sqid', $subqueue->sqid) ->condition('position', $position) @@ -2359,7 +2359,7 @@ ->condition('sqid', $subqueue->sqid) ->condition('position', $position, '<') ->execute(); - + db_insert('nodequeue_nodes') ->fields(array( 'qid' => $entry->qid, @@ -2368,7 +2368,7 @@ 'position' => $subqueue->count, 'timestamp' => $entry->timestamp, )) - ->execute(); + ->execute(); } /** @@ -2388,7 +2388,7 @@ if (empty($subqueues)) { return; } - + $query = db_select('nodequeue_nodes', 'n') ->fields('n', array('sqid')) ->condition('sqid', array_keys($subqueues), 'IN') @@ -2462,7 +2462,7 @@ if (empty($text)) { return $subqueue->title; } - $text = str_replace('%subqueue', $subqueue->title, $text); + $text = str_replace('%subqueue', t($subqueue->title), t($text)); return $text; } @@ -2539,7 +2539,7 @@ ->orderBy('nn.position', $orderby) ->addTag('node_access'); $query->leftJoin('nodequeue_nodes', 'nn', 'n.nid = nn.nid'); - + if ($published_only) { $query->condition('n.status', 1); } @@ -2575,7 +2575,7 @@ ->orderBy('nn.position', $orderby) ->addTag('node_access'); $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid'); - + if ($published_only) { $query->condition('n.status', 1); } @@ -2622,7 +2622,7 @@ ->execute() ->fetchField(); $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid'); - + return nodequeue_view_nodes($sqid, FALSE, $teaser, $links, rand(0, $count - 1), 1); } @@ -2639,7 +2639,7 @@ ->execute() ->fetchField(); $query->join('nodequeue_nodes', 'nn', 'n.nid = nn.nid'); - + return array_shift(nodequeue_load_nodes($sqid, TRUE, rand(0, $count - 1), 1)); } @@ -2661,7 +2661,7 @@ ->range(0, 1) ->execute() ->fetchField(); - + return nodequeue_subqueue_position($sqid, $nid); } @@ -2811,7 +2811,7 @@ } else { $result = $query->execute(); - + foreach ($result as $node) { $matches[$node->nid] = check_plain($node->title) . " [nid: $node->nid]"; } @@ -2985,9 +2985,9 @@ 'nodequeue' => array( 'reverse' => (bool) $form['#queue']['reverse'], ) - ), + ), array( - 'type' => 'setting', + 'type' => 'setting', 'scope' => JS_DEFAULT, ) );