Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[REF] Remove apparent copy & paste code. #16308

Merged
merged 1 commit into from
Jan 17, 2020
Merged

[REF] Remove apparent copy & paste code. #16308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CRM/Activity/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion CRM/Campaign/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand Down
1 change: 0 additions & 1 deletion CRM/Case/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 1 addition & 2 deletions CRM/Contact/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion CRM/Contribute/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 0 additions & 7 deletions CRM/Core/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down
1 change: 0 additions & 1 deletion CRM/Event/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion CRM/Grant/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion CRM/Member/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion CRM/Pledge/Form/Search.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ public function getDefaultEntity() {
*/
public function preProcess() {

$this->_searchButtonName = $this->getButtonName('refresh');
$this->_actionButtonName = $this->getButtonName('next', 'action');

$this->_done = FALSE;
Expand Down