From: Coleman Watts <coleman@civicrm.org>
Date: Mon, 20 Jul 2015 14:20:33 +0000 (-0400)
Subject: Merge branch '4.6' into master
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=3918a4767354f491f34d92b0667798d944fa0ed8;p=civicrm-core.git

Merge branch '4.6' into master
---

3918a4767354f491f34d92b0667798d944fa0ed8
diff --cc CRM/Contact/Form/Search/Advanced.php
index 8335159080,6572be6c58..e82ae6bf35
--- a/CRM/Contact/Form/Search/Advanced.php
+++ b/CRM/Contact/Form/Search/Advanced.php
@@@ -377,10 -377,8 +377,11 @@@ class CRM_Contact_Form_Search_Advanced 
        '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) {