From a5ca2ad8e16b145edf3a5604fab923d1e2386b37 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 26 May 2019 12:05:08 +1200 Subject: [PATCH] [REF] use generic loadStandardSearchOptionsFromUrl I picked this up as a reviewer's commit of https://github.com/civicrm/civicrm-core/pull/13651 That PR is stale but I like to pick out a bit I can get merged when closing a stale pr --- CRM/Contact/Form/Search.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Contact/Form/Search.php b/CRM/Contact/Form/Search.php index 9af7f55b1792..30090566dbdd 100644 --- a/CRM/Contact/Form/Search.php +++ b/CRM/Contact/Form/Search.php @@ -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 */ @@ -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'; }