From b14b42072a7f235f97ea5901bd49dc45f992f6a5 Mon Sep 17 00:00:00 2001 From: Thomas Date: Tue, 16 Oct 2018 12:20:58 -0400 Subject: [PATCH] smart groups as mailing lists were not taking unsubscribed users into account --- CRM/Mailing/BAO/Mailing.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php index f81bcb1d05..aab22a064a 100644 --- a/CRM/Mailing/BAO/Mailing.php +++ b/CRM/Mailing/BAO/Mailing.php @@ -297,9 +297,11 @@ class CRM_Mailing_BAO_Mailing extends CRM_Mailing_DAO_Mailing { ->select("$contact.id as contact_id, $entityTable.id as $entityColumn") ->join($entityTable, " INNER JOIN $entityTable ON $entityTable.contact_id = $contact.id ") ->join('gc', " INNER JOIN civicrm_group_contact_cache gc ON $contact.id = gc.contact_id ") + ->join('gcr', " LEFT JOIN civicrm_group_contact gcr ON gc.group_id = gcr.group_id AND gc.contact_id = gcr.contact_id") ->join('mg', " INNER JOIN civicrm_mailing_group mg ON gc.group_id = mg.entity_id AND mg.search_id IS NULL ") ->join('temp', " LEFT JOIN $excludeTempTablename temp ON $contact.id = temp.contact_id ") ->where('gc.group_id IN (#groups)') + ->where('gcr.status IS NULL OR gcr.status != "Removed"') ->merge($criteria) ->replaceInto($includedTempTablename, array('contact_id', $entityColumn)) ->param('#groups', $includeSmartGroupIDs) -- 2.25.1