From 8010925d28022f64e7b7af4957de3af1b9f6676a Mon Sep 17 00:00:00 2001 From: yashodha Date: Fri, 10 Jan 2014 13:50:42 +0530 Subject: [PATCH] CRM-13947: fix where clause condition --- CRM/Core/BAO/ActionSchedule.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CRM/Core/BAO/ActionSchedule.php b/CRM/Core/BAO/ActionSchedule.php index decb24753c..5bfedcecdc 100755 --- a/CRM/Core/BAO/ActionSchedule.php +++ b/CRM/Core/BAO/ActionSchedule.php @@ -1026,14 +1026,18 @@ LEFT JOIN {$reminderJoinClause} reminder.entity_id = c.id AND reminder.entity_table = 'civicrm_contact' AND reminder.action_schedule_id = {$actionSchedule->id}"; - + $addWhereClause = ''; + if ($addWhere) { + $addWhereClause = "AND {$addWhere}"; + } $insertAdditionalSql =" INSERT INTO civicrm_action_log (contact_id, entity_id, entity_table, action_schedule_id) {$addSelect} FROM ({$contactTable}, {$table}) LEFT JOIN {$additionReminderClause} {$addGroup} -{$additionWhere} c.is_deleted = 0 AND c.is_deceased = 0 AND {$addWhere} +{$additionWhere} c.is_deleted = 0 AND c.is_deceased = 0 +{$addWhereClause} AND {$dateClause} AND c.id NOT IN ( SELECT rem.contact_id -- 2.25.1