changed from using a custom function to get the enabled components to use CRM_Core_Co...

diff --git a/CRM/Contact/Form/Search/Criteria.php b/CRM/Contact/Form/Search/Criteria.php
index 4c2446cba42fa94d5c7ab8eb7fc8bb01d35469e8..d58d102276d0d6a085b57f695f002aadaa4a89b9 100644 (file)
--- a/CRM/Contact/Form/Search/Criteria.php
+++ b/CRM/Contact/Form/Search/Criteria.php
@@ -158,8 +158,13 @@ class CRM_Contact_Form_Search_Criteria {
     );
 
     $componentModes = CRM_Contact_Form_Search::getModeSelect();
+    $enabledComponents = CRM_Core_Component::getEnabledComponents();
 
-    self::validatePossibleComponents($componentModes);
+    // unset disabled components that must should have been enabled
+    // to the option be viable
+    if (!array_key_exists('CiviMail', $enabledComponents)) {
+        unset($componentModes['8']);
+    }
 
     // unset contributions or participants if user does not have
     // permission on them
@@ -541,19 +546,4 @@ class CRM_Contact_Form_Search_Criteria {
     CRM_Case_BAO_Query::buildSearchForm($form);
   }
 
-  public static function getEnabledComponents() {
-    $apiResult = civicrm_api3('Setting', 'Get', array());
-    return $apiResult['values'][1]['enable_components'];
-  }
-
-  //the idea is to validate everything in here and remove based on possible situations
-  public static function validatePossibleComponents(&$componentModes) {
-    $enabledComponents = self::getEnabledComponents();
-
-    //e.g. this validation that removes the 'Mailing' option if CiviMail is not enabled
-    if (!in_array('CiviMail', $enabledComponents)) {
-      unset($componentModes['8']);
-    }
-  }
-
 }