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 10e4a0d5c2f0cb31067ba9edd6f43089a899cb1c..e82ae6bf3573b6de0e2b557f9cc2ad86b367a6ed 100644 (file)
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@ -3,7 +3,7 @@
  +--------------------------------------------------------------------+
  | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@ s | under the terms of the GNU Affero General Public License           |
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -214,6 +214,7 @@ class CRM_Contact_Form_Search_Advanced extends CRM_Contact_Form_Search {
     }
 
     $defaults['privacy_toggle'] = 1;
+    $defaults['operator'] = 'AND';
 
     return $defaults;
   }
@@ -369,11 +370,18 @@ 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',
       'activity_subject',
+      'contribution_page_id',
+      '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) {