Merge branch '4.6' into master

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

diff --git a/CRM/Contact/Form/Search/Advanced.php b/CRM/Contact/Form/Search/Advanced.php
index 33c037ecf74fa14066bef469768a88d5c1f508c4..e82ae6bf3573b6de0e2b557f9cc2ad86b367a6ed 100644 (file)
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -370,6 +370,9 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
       'contribution_status',
       'contribution_status_id',
       'contribution_source',
+      'membership_type_id',
+      'membership_status_id',
+      'participant_status_id',
       'contribution_trxn_id',
       'activity_type_id',
       'status_id',
@@ -378,6 +381,7 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
       'contribution_product_id',
       'payment_instrument_id',
     );
+    $specialParams += preg_grep('/^custom_/', array_keys($this->_formValues));
     foreach ($specialParams as $element) {
       $value = CRM_Utils_Array::value($element, $this->_formValues);
       if ($value) {