diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index 57a35aef82d1..06dab35143ad 100644 --- 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 index 0ec2990d5471..ca86ffd86b55 100644 --- 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 index e6820681213d..8d971a851f75 100644 --- 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 index eca29eb4d4e3..8277133483d0 100644 --- 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 index 3f780e8323fc..6ad2e48cd7ea 100644 --- 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 index 4dc1b95db364..66cebe8282be 100644 --- 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 index 704d40b3f4f2..77c5f938f465 100644 --- 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 index 4c54877d0786..1ea774db2217 100644 --- 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 index 0b8774e903e9..1d9234f5437c 100644 --- 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 index 92158a070cb5..7f7e75c52988 100644 --- 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;