Index: nodequeue.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodequeue/nodequeue.module,v retrieving revision 1.39.2.28.2.23 diff -u -p -u -p -r1.39.2.28.2.23 nodequeue.module --- nodequeue.module 11 Oct 2007 23:36:19 -0000 1.39.2.28.2.23 +++ nodequeue.module 14 Nov 2007 22:13:10 -0000 @@ -318,7 +318,7 @@ function nodequeue_admin_add_node($queue if (isset($_GET['tab'])) { nodequeue_js_output(t('Remove from queue'), url("admin/content/nodequeue/$queue->qid/remove-node/$subqueue->sqid/$node->nid", "tab"), - nodequeue_subqueue_size_text($queue->size, $queue->size ? min($subqueue->count + 1, $queue->size) : $subqueue->count + 1, FALSE), + theme('nodequeue_subqueue_size_text', $queue->size, $queue->size ? min($subqueue->count + 1, $queue->size) : $subqueue->count + 1, FALSE), $subqueue->sqid); } else { @@ -341,7 +341,7 @@ function nodequeue_admin_remove_node($qu if (isset($_GET['tab'])) { nodequeue_js_output(t('Add to queue'), url("admin/content/nodequeue/$queue->qid/add/$subqueue->sqid/$node->nid", "tab"), - nodequeue_subqueue_size_text($queue->size, $subqueue->count - 1, FALSE), + theme('nodequeue_subqueue_size_text', $queue->size, $subqueue->count - 1, FALSE), $subqueue->sqid); } else { @@ -400,7 +400,7 @@ function nodequeue_node_tab($node, $queu array( 'id' => 'nodequeue-count-' . $subqueue->sqid, 'class' => 'nodequeue-in-queue', - 'data' => nodequeue_subqueue_size_text($queue->size, $subqueue->count, FALSE) + 'data' => theme('nodequeue_subqueue_size_text', $queue->size, $subqueue->count, FALSE) ), array('class' => 'nodequeue-operation', 'data' => $op), ); @@ -443,7 +443,7 @@ function nodequeue_view_queues() { foreach ($queues as $queue) { $sub_text = $queue->subqueues; if ($sub_text == 1) { - $sub_text .= " (" . nodequeue_subqueue_size_text($queue->size, $queue->subqueue->count) . ")"; + $sub_text .= " (" . theme('nodequeue_subqueue_size_text', $queue->size, $queue->subqueue->count) . ")"; } $operations = array(l(t('View'), "admin/content/nodequeue/$queue->qid/view")); @@ -477,7 +477,7 @@ function nodequeue_view_subqueues($queue $rows = array(); foreach ($subqueues as $subqueue) { - $sub_text = nodequeue_subqueue_size_text($queue->size, $subqueue->count, FALSE); + $sub_text = theme('nodequeue_subqueue_size_text', $queue->size, $subqueue->count, FALSE); $rows[] = array( array('class' => 'nodequeue-title', 'data' => check_plain($subqueue->title)), array('class' => 'nodequeue-subqueues', 'data' => $sub_text), @@ -1979,7 +1979,7 @@ function nodequeue_get_subqueues_by_node /** * Get a textual representation of a nodequeue's queue size. */ -function nodequeue_subqueue_size_text($max, $count, $long = TRUE) { +function theme_nodequeue_subqueue_size_text($max, $count, $long = TRUE) { if (empty($count)) { $message = t('Queue empty'); }