Skip to content

Commit

Permalink
[REF] use generic loadStandardSearchOptionsFromUrl
Browse files Browse the repository at this point in the history
I picked this up as a reviewer's commit of civicrm#13651

That PR is stale but I like to pick out a bit I can get merged when closing a stale pr
  • Loading branch information
eileenmcnaughton committed May 26, 2019
1 parent 7c295e8 commit a5ca2ad
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions CRM/Contact/Form/Search.php
Original file line number Diff line number Diff line change
Expand Up @@ -531,17 +531,14 @@ public function preProcess() {
* driven by the wizard framework
*/

$this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean');

$this->_force = CRM_Utils_Request::retrieve('force', 'Boolean');
$this->_groupID = CRM_Utils_Request::retrieve('gid', 'Positive', $this);
$this->_amtgID = CRM_Utils_Request::retrieve('amtgID', 'Positive', $this);
$this->_ssID = CRM_Utils_Request::retrieve('ssID', 'Positive', $this);
$this->_sortByCharacter = CRM_Utils_Request::retrieve('sortByCharacter', 'String', $this);
$this->_ufGroupID = CRM_Utils_Request::retrieve('id', 'Positive', $this);
$this->_componentMode = CRM_Utils_Request::retrieve('component_mode', 'Positive', $this, FALSE, CRM_Contact_BAO_Query::MODE_CONTACTS, $_REQUEST);
$this->_operator = CRM_Utils_Request::retrieve('operator', 'String', $this, FALSE, CRM_Contact_BAO_Query::SEARCH_OPERATOR_AND, 'REQUEST');

$this->loadStandardSearchOptionsFromUrl();
/**
* set the button names
*/
Expand All @@ -559,7 +556,6 @@ public function preProcess() {
}

// assign context to drive the template display, make sure context is valid
$this->_context = CRM_Utils_Request::retrieve('context', 'Alphanumeric', $this, FALSE, 'search');
if (!CRM_Utils_Array::value($this->_context, self::validContext())) {
$this->_context = 'search';
}
Expand Down

0 comments on commit a5ca2ad

Please sign in to comment.