From 3c7eed585407bce093cd72e6c1c8788cb6260432 Mon Sep 17 00:00:00 2001 From: Erik Hommel <hommel@ee-atwork.nl> Date: Thu, 12 Mar 2015 15:13:54 +0100 Subject: [PATCH] cleaned --- CRM/Civirules/Engine.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/CRM/Civirules/Engine.php b/CRM/Civirules/Engine.php index 4c432ff..2959a8f 100644 --- a/CRM/Civirules/Engine.php +++ b/CRM/Civirules/Engine.php @@ -42,12 +42,12 @@ class CRM_Civirules_Engine { $object->processAction($eventData); } - protected static function areConditionsValid(CRM_Civirules_EventData_EventData $eventData, $rule_id) { + protected static function areConditionsValid(CRM_Civirules_EventData_EventData $eventData, $ruleId) { $isValid = true; $firstCondition = true; $conditionParams = array( - 'rule_id' => $rule_id + 'rule_id' => $ruleId ); $ruleConditions = CRM_Civirules_BAO_RuleCondition::getValues($conditionParams); foreach ($ruleConditions as $ruleConditionId => $ruleCondition) { @@ -81,7 +81,6 @@ class CRM_Civirules_Engine { } $condition->setRuleConditionData($ruleCondition); $isValid = $condition->isConditionValid($eventData); - return $isValid ? true : false; + return $isValid; } - } \ No newline at end of file -- GitLab