From 4d59d31be823c3d39689a776fd24002e3e2177d2 Mon Sep 17 00:00:00 2001 From: Barbara Miller Date: Sun, 14 Jun 2015 20:14:13 -0700 Subject: [PATCH] Update Mailing.php is_deceased queries Include contacts where is_deceased is set to null or False (not True) in bulk e-mail lists --- CRM/Mailing/BAO/Mailing.php | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index 1ff5d6f248ce..3742ae69ddf7 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -312,7 +312,7 @@ public static function &getRecipients( AND $g2contact.status = 'Added' AND $contact.do_not_email = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $location_filter AND $email.email IS NOT NULL AND $email.email != '' @@ -343,7 +343,7 @@ public static function &getRecipients( AND $g2contact.status = 'Added' AND $contact.do_not_sms = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $phone.phone_type_id = {$phoneTypes['Mobile']} AND $phone.phone IS NOT NULL AND $phone.phone != '' @@ -372,7 +372,7 @@ public static function &getRecipients( ($mg.group_type = 'Include') AND $contact.do_not_email = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $location_filter AND $email.on_hold = 0 AND $mg.mailing_id = {$mailing_id} @@ -398,7 +398,7 @@ public static function &getRecipients( ($mg.group_type = 'Include') AND $contact.do_not_sms = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $phone.phone_type_id = {$phoneTypes['Mobile']} AND $mg.mailing_id = {$mailing_id} AND X_$job_id.contact_id IS null"; @@ -434,7 +434,7 @@ public static function &getRecipients( WHERE gc.group_id = {$groupDAO->id} AND c.do_not_email = 0 AND c.is_opt_out = 0 - AND c.is_deceased = 0 + AND c.is_deceased <> 1 AND $location_filter AND civicrm_email.on_hold = 0 AND X_$job_id.contact_id IS null @@ -451,7 +451,7 @@ public static function &getRecipients( WHERE gc.group_id = {$groupDAO->id} AND c.do_not_sms = 0 AND c.is_opt_out = 0 - AND c.is_deceased = 0 + AND c.is_deceased <> 1 AND p.phone_type_id = {$phoneTypes['Mobile']} AND X_$job_id.contact_id IS null"; } @@ -498,7 +498,7 @@ public static function &getRecipients( AND $g2contact.status = 'Added' AND $contact.do_not_email = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $location_filter AND $email.on_hold = 0 AND $mg.mailing_id = {$mailing_id} @@ -523,7 +523,7 @@ public static function &getRecipients( AND $g2contact.status = 'Added' AND $contact.do_not_sms = 0 AND $contact.is_opt_out = 0 - AND $contact.is_deceased = 0 + AND $contact.is_deceased <> 1 AND $phone.phone_type_id = {$phoneTypes['Mobile']} AND $mg.mailing_id = {$mailing_id} AND X_$job_id.contact_id IS null"; @@ -939,7 +939,7 @@ public function getTestRecipients($testParams) { WHERE (civicrm_email.is_bulkmail = 1 OR civicrm_email.is_primary = 1) AND civicrm_contact.id = {$groupContact} AND civicrm_contact.do_not_email = 0 -AND civicrm_contact.is_deceased = 0 +AND civicrm_contact.is_deceased <> 1 AND civicrm_email.on_hold = 0 AND civicrm_contact.is_opt_out = 0 GROUP BY civicrm_email.id