CRM-16373 - Disintermediate oddball CIVICRM_GROUPTREE ($config->groupTree)

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
index e10b781f7b6df4b988d5e8269a58ea6026f11fde..0a9388229450e60c7d705f7584265309ad7c3e52 100644 (file)
--- a/CRM/Contribute/Form/Search.php
+++ b/CRM/Contribute/Form/Search.php
@@ -291,7 +291,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search {
         }
       }
 
-      if (!$config->groupTree) {
+      if (!defined('CIVICRM_GROUPTREE')) {
         $group = CRM_Utils_Array::value('group', $this->_formValues);
         if ($group && !is_array($group)) {
           unset($this->_formValues['group']);

diff --git a/CRM/Core/Config/Defaults.php b/CRM/Core/Config/Defaults.php
index 5b6b82069addbbd3bc35d2c7b31dd5721c59bf25..26d652a7093a356cf225bfc5ae5096c31210b42e 100644 (file)
--- a/CRM/Core/Config/Defaults.php
+++ b/CRM/Core/Config/Defaults.php
@@ -56,9 +56,6 @@ class CRM_Core_Config_Defaults {
     );
 
     $this->sqlDir = $civicrm_root . DIRECTORY_SEPARATOR . 'sql' . DIRECTORY_SEPARATOR;
-
-    // show tree widget
-    $this->groupTree = defined('CIVICRM_GROUPTREE') ? TRUE : FALSE;
   }
 
   /**