From e9498a557e2e62b771db5009a0b1e23a9e8617bf Mon Sep 17 00:00:00 2001 From: chaosphere2112 Date: Mon, 25 Nov 2013 09:11:40 -0800 Subject: [PATCH] Fix for return true when no nodequeue association found in nodequeue_rules --- addons/nodequeue_rules/nodequeue_rules.rules.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/addons/nodequeue_rules/nodequeue_rules.rules.inc b/addons/nodequeue_rules/nodequeue_rules.rules.inc index 69b744d..2b8eff8 100644 --- a/addons/nodequeue_rules/nodequeue_rules.rules.inc +++ b/addons/nodequeue_rules/nodequeue_rules.rules.inc @@ -45,7 +45,8 @@ function nodequeue_rules_node_in_queue($queue, $node) { ->execute() ->fetchAssoc(); // All conditions return TRUE or FALSE. - return ($queue->qid == $node_in_queue['qid']) ? TRUE : FALSE; + // fetchAssoc returns false if no row is found; use implicit truthiness get around that case. + return $fetchAssoc() && ($queue->qid == $node_in_queue['qid']) ? TRUE : FALSE; } /** -- 1.8.1.2