Merge pull request #6293 from JoeMurray/patch-1

[civicrm-core.git] / CRM / Member / Form / Search.php

diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php
index 66c36566085e6ce376b40b8ad307bff0cb63f83f..4d7129a98827cd3a1256be0f7edcda46d80dfc4c 100644 (file)
--- a/CRM/Member/Form/Search.php
+++ b/CRM/Member/Form/Search.php
@@ -63,8 +63,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search {
    */
   protected $_limit = NULL;
 
-  protected $_defaults;
-
   /**
    * Prefix for the controller.
    */
@@ -216,15 +214,11 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search {
     foreach ($specialParams as $element) {
       $value = CRM_Utils_Array::value($element, $this->_formValues);
       if (!empty($value) && is_array($value)) {
-        if ($element == 'status_id') {
-          unset($this->_formValues[$element]);
-          $element = 'member_' . $element;
-        }
         $this->_formValues[$element] = array('IN' => $value);
       }
     }
 
-    CRM_Core_BAO_CustomValue::fixFieldValueOfTypeMemo($this->_formValues);
+    CRM_Core_BAO_CustomValue::fixCustomFieldValue($this->_formValues);
 
     $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues);