dev/core#538 fix advanced search on activity subject, detail to use wildcards like...

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

diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php
index 063fa8001f319fb447a32e503d86dae9fc48e865..4ede56c436318739c2f5f3815e8ba32e937e8d97 100644 (file)
--- a/CRM/Activity/Form/Search.php
+++ b/CRM/Activity/Form/Search.php
@@ -196,14 +196,12 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search {
     }
 
     $this->_done = TRUE;
-
+    $this->setFormValues();
     if (!empty($_POST)) {
-      $this->_formValues = $this->controller->exportValues($this->_name);
       $specialParams = [
         'activity_type_id',
         'status_id',
         'priority_id',
-        'activity_text',
       ];
       $changeNames = [
         'status_id' => 'activity_status_id',
@@ -353,16 +351,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search {
     return NULL;
   }
 
-  /**
-   * This virtual function is used to set the default values of various form elements.
-   *
-   * @return array|NULL
-   *   reference to the array of default values
-   */
-  public function setDefaultValues() {
-    return array_merge($this->getEntityDefaults($this->getDefaultEntity()), (array) $this->_formValues);
-  }
-
   /**
    * Return a descriptive name for the page, used in wizard header
    *