From 954eaf877d8142f0647f47c1424af17a386a6d31 Mon Sep 17 00:00:00 2001
From: Seamus Lee <seamuslee001@gmail.com>
Date: Fri, 12 Jun 2015 00:00:26 +0000
Subject: [PATCH] CRM-16600 Include Smart Groups in unsubscribe group select

---
 CRM/Mailing/Form/Group.php       | 5 +++--
 ang/crmMailing/BlockMailing.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/CRM/Mailing/Form/Group.php b/CRM/Mailing/Form/Group.php
index 7e07873d52..f64c236d2a 100644
--- a/CRM/Mailing/Form/Group.php
+++ b/CRM/Mailing/Form/Group.php
@@ -238,13 +238,14 @@ class CRM_Mailing_Form_Group extends CRM_Contact_Form_Task {
 
     //when the context is search add base group's.
     if ($this->_searchBasedMailing) {
-      //get the static groups
+      //CRM-16600 Include Smart Groups in Unsubscribe list as that matches
+      //all other practices in CiviMail
       $staticGroups = CRM_Core_PseudoConstant::staticGroup(FALSE, 'Mailing');
       $this->add('select', 'baseGroup',
         ts('Unsubscription Group'),
         array(
           '' => ts('- select -'),
-        ) + CRM_Contact_BAO_Group::getGroupsHierarchy($staticGroups, NULL, '&nbsp;&nbsp;', TRUE),
+        ) + $groups,
         TRUE,
         array('class' => 'crm-select2 huge')
       );
diff --git a/ang/crmMailing/BlockMailing.html b/ang/crmMailing/BlockMailing.html
index 8e43ecdc4c..d3112f1b01 100644
--- a/ang/crmMailing/BlockMailing.html
+++ b/ang/crmMailing/BlockMailing.html
@@ -60,7 +60,7 @@ It could perhaps be thinned by 30-60% by making more directives.
           ng-model="mailing.recipients.groups.base[0]"
           ng-required="true"
           >
-          <option ng-repeat="grp in crmMailingConst.groupNames | filter:{visibility:'Public pages'}" value="{{grp.id}}">{{grp.title}}</option>
+          <option ng-repeat="grp in crmMailingConst.groupNames | orderBy:'title'" value="{{grp.id}}">{{grp.title}}</option>
         </select>
       </div>
     </span>
-- 
2.25.1