From 96a5d3f0fc3acc026c79a1383524bdc4e4e1ee25 Mon Sep 17 00:00:00 2001
From: lslade <lslade@rnao.ca>
Date: Fri, 1 Jun 2018 12:40:04 -0400
Subject: [PATCH 1/2] Fix for dev/mail#13 - All members should not be excluded
 from Smart unsubscribe group.

---
 CRM/Mailing/BAO/Mailing.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 09983f45bfed..5ff5ec5f106b 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -166,9 +166,10 @@ public static function getRecipients($mailingID) {
         if ($groupType == 'Include') {
           $includeSmartGroupIDs[] = $groupDAO->id;
         }
-        else {
+        else if ($groupType == 'Exclude') {
           $excludeSmartGroupIDs[] = $groupDAO->id;
         }
+        //NOTE: Do nothing for base
       }
     }
 

From a698bb7d490ce6002defc0ca5733235f739ef2a1 Mon Sep 17 00:00:00 2001
From: lslade <lslade@rnao.ca>
Date: Mon, 4 Jun 2018 11:02:00 -0400
Subject: [PATCH 2/2] Fix code style - use elseif

---
 CRM/Mailing/BAO/Mailing.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CRM/Mailing/BAO/Mailing.php b/CRM/Mailing/BAO/Mailing.php
index 5ff5ec5f106b..d87088411c6a 100644
--- a/CRM/Mailing/BAO/Mailing.php
+++ b/CRM/Mailing/BAO/Mailing.php
@@ -166,7 +166,7 @@ public static function getRecipients($mailingID) {
         if ($groupType == 'Include') {
           $includeSmartGroupIDs[] = $groupDAO->id;
         }
-        else if ($groupType == 'Exclude') {
+        elseif ($groupType == 'Exclude') {
           $excludeSmartGroupIDs[] = $groupDAO->id;
         }
         //NOTE: Do nothing for base