From 7637f6736597fbba8093bf37643319ead7989acf Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 3 Dec 2014 12:41:15 +1300 Subject: [PATCH] CRM-15550 adding a test shows only one instance of checking has been updated --- CRM/Core/BAO/ActionSchedule.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index 94b8e0ea66..06b7ba1e2d 100644 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -1233,8 +1233,8 @@ LEFT JOIN {$reminderJoinClause} {$whereClause} {$limitWhereClause} AND {$dateClause} {$notINClause} "; CRM_Core_DAO::executeQuery($query, array(1 => array($actionSchedule->id, 'Integer'))); - - if (!is_null($limitTo) && $limitTo == 0 && (!empty($addGroup) || !empty($addWhere))) { + $isSendToAdditionalContacts = (!is_null($limitTo) && $limitTo == 0 && (!empty($addGroup) || !empty($addWhere))) ? TRUE : FALSE; + if ($isSendToAdditionalContacts) { $additionWhere = ' WHERE '; if ($actionSchedule->start_action_date) { $additionWhere = $whereClause . ' AND '; @@ -1322,7 +1322,7 @@ INNER JOIN {$reminderJoinClause} CRM_Core_DAO::executeQuery($query, array(1 => array($actionSchedule->id, 'Integer'))); } - if (!is_null($limitTo) && $limitTo == 0) { + if ($isSendToAdditionalContacts) { $addSelect .= ', MAX(reminder.action_date_time) as latest_log_time'; $sqlEndEventCheck = " SELECT * FROM {$table} -- 2.25.1