diff -u nodequeue.install nodequeue.install --- nodequeue.install 30 Dec 2010 21:14:58 -0000 +++ nodequeue.install 4 Jan 2011 15:11:58 -0000 @@ -14,7 +14,7 @@ 'name' => array( 'description' => t('The machine name for the queue'), 'type' => 'varchar', - 'length' => 32, + 'length' => 128, ), 'title' => array( 'description' => t('Title of a queue.'), @@ -491,7 +491,7 @@ $ret = array(); db_add_field($ret, 'nodequeue_queue', 'name', array( 'type' => 'varchar', - 'length' => 32, + 'length' => 128, )); db_add_unique_key($ret, 'nodequeue_queue', 'name', array('name')); diff -u nodequeue.module nodequeue.module --- nodequeue.module 30 Dec 2010 21:14:58 -0000 +++ nodequeue.module 4 Jan 2011 15:11:59 -0000 @@ -1525,17 +1525,27 @@ return nodequeue_load_queues(array_keys($qids), $bypass_cache); } - /** * Return a queue by its machine name. This is obviously not ideal due to the * extra queries, but probably preferable to changing current API calls. * * @param $name - * The queue's machine name + * The queue machine name + * + * @return + * The queue definition, or an empty array if no queue was found with the + * given machine name. */ function nodequeue_load_queue_by_name($name) { $map = nodequeue_get_qid_map(); - return isset($map[$name]) ? nodequeue_load_queues(array($map[$name]) ) : array(); + if (isset($map[$name])) { + $queues = nodequeue_load_queues(array($map[$name])); + if ($queues) { + return current($queues); + } + } + + return array(); } diff -u includes/views/nodequeue_handler_relationship_nodequeue.inc includes/views/nodequeue_handler_relationship_nodequeue.inc --- includes/views/nodequeue_handler_relationship_nodequeue.inc 30 Dec 2010 21:14:58 -0000 +++ includes/views/nodequeue_handler_relationship_nodequeue.inc 4 Jan 2011 15:11:59 -0000 @@ -64,7 +64,7 @@ if (!empty($this->options['limit'])) { $qids = array(); $map = nodequeue_get_qid_map(); - foreach($map as $name => $qid) { + foreach ($map as $name => $qid) { if (isset($this->options['names'][$name]) ) { $qids[] = $qid; } @@ -83 +83 @@ -} \ Pas de fin de ligne à la fin du fichier. +}