Merge pull request #16308 from eileenmcnaughton/search_ref

[REF] Remove apparent copy & paste code.
civicrm · Jan 17, 2020 · 4f29e2d · 4f29e2d
2 parents 2497964 + 804beb7
commit 4f29e2d
Show file tree

Hide file tree

Showing 10 changed files with 1 addition and 17 deletions.
diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php
@@ -71,7 +71,6 @@ public function preProcess() {
     $this->set('searchFormName', 'Search');
 
     // set the button names
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Campaign/Form/Search.php b/CRM/Campaign/Form/Search.php
@@ -58,7 +58,6 @@ public function preProcess() {
     $this->_defaults = array();
 
     //set the button name.
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_printButtonName = $this->getButtonName('next', 'print');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 

diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php
@@ -75,7 +75,6 @@ public function preProcess() {
     /**
      * set the button names
      */
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php
@@ -530,7 +530,6 @@ public function preProcess() {
     /**
      * set the button names
      */
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->assign('actionButtonName', $this->_actionButtonName);
@@ -793,7 +792,7 @@ public function postProcess() {
       return;
     }
     else {
-      if (array_key_exists($this->_searchButtonName, $_POST) ||
+      if (array_key_exists($this->getButtonName('refresh'), $_POST) ||
         ($this->_force && !$crmPID)
       ) {
         //reset the cache table for new search

diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php
@@ -63,7 +63,6 @@ public function getDefaultEntity() {
   public function preProcess() {
     $this->set('searchFormName', 'Search');
 
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Core/Form/Search.php b/CRM/Core/Form/Search.php
@@ -21,13 +21,6 @@ class CRM_Core_Form_Search extends CRM_Core_Form {
    */
   protected $_force;
 
-  /**
-   * Name of search button
-   *
-   * @var string
-   */
-  protected $_searchButtonName;
-
   /**
    * Name of action button
    *

diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php
@@ -84,7 +84,6 @@ public function preProcess() {
     /**
      * set the button names
      */
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php
@@ -72,7 +72,6 @@ public function preProcess() {
     /**
      * set the button names
      */
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php
@@ -65,7 +65,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search {
   public function preProcess() {
     $this->set('searchFormName', 'Search');
 
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;

diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php
@@ -59,7 +59,6 @@ public function getDefaultEntity() {
    */
   public function preProcess() {
 
-    $this->_searchButtonName = $this->getButtonName('refresh');
     $this->_actionButtonName = $this->getButtonName('next', 'action');
 
     $this->_done = FALSE;