From ac7b09fcd982dac9be53a67704110a947d31ec5c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 2 Jan 2017 11:10:56 +1300
Subject: [PATCH] CRM-19184 remove old old old suppress group functionality by
 defining 'CIVICRM_GROUPTREE'

---
 CRM/Contribute/Form/Search.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index e4e2df3d84..14c3ace64a 100644
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -297,20 +297,19 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search {
         }
       }
 
-      if (!defined('CIVICRM_GROUPTREE')) {
-        $group = CRM_Utils_Array::value('group', $this->_formValues);
-        if ($group && !is_array($group)) {
-          unset($this->_formValues['group']);
-          $this->_formValues['group'][$group] = 1;
-        }
+      $group = CRM_Utils_Array::value('group', $this->_formValues);
+      if ($group && !is_array($group)) {
+        unset($this->_formValues['group']);
+        $this->_formValues['group'][$group] = 1;
+      }
 
-        if ($group && is_array($group)) {
-          unset($this->_formValues['group']);
-          foreach ($group as $notImportant => $groupID) {
-            $this->_formValues['group'][$groupID] = 1;
-          }
+      if ($group && is_array($group)) {
+        unset($this->_formValues['group']);
+        foreach ($group as $groupID) {
+          $this->_formValues['group'][$groupID] = 1;
         }
       }
+
     }
 
     CRM_Core_BAO_CustomValue::fixCustomFieldValue($this->_formValues);
-- 
2.25.1