From 4b8a75792d5f5af43cba7ad6c4e2df8625b4897a Mon Sep 17 00:00:00 2001
From: Dave Jenkins <davej+git@circle-interactive.co.uk>
Date: Thu, 21 Sep 2017 13:10:27 +0100
Subject: [PATCH] CRM-16836 - make Basic Search form group select respect ACLs

---
 CRM/Contact/Form/Search/Basic.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CRM/Contact/Form/Search/Basic.php b/CRM/Contact/Form/Search/Basic.php
index 057f54f13a..460af450a5 100644
--- a/CRM/Contact/Form/Search/Basic.php
+++ b/CRM/Contact/Form/Search/Basic.php
@@ -64,11 +64,14 @@ class CRM_Contact_Form_Search_Basic extends CRM_Contact_Form_Search {
     }
 
     // add select for groups
+    // Get hierarchical listing of groups, respecting ACLs for CRM-16836.
+    $groupHierarchy = CRM_Contact_BAO_Group::getGroupsHierarchy($this->_group, NULL, '&nbsp;&nbsp;', TRUE);
     if (!empty($searchOptions['groups'])) {
       $this->addField('group', array(
           'entity' => 'group_contact',
           'label' => ts('in'),
           'placeholder' => ts('- any group -'),
+          'options' => $groupHierarchy,
         ));
     }
 
-- 
2.25.1