From: Seamus Lee Date: Mon, 9 Dec 2019 03:47:55 +0000 (+1100) Subject: [REF] Refactor Activity Search to use parent getSortID function X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=d9669ca61e69fab5084c46e9e6bd0fca1e085bf0;p=civicrm-core.git [REF] Refactor Activity Search to use parent getSortID function --- diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index 37509894b7..57a35aef82 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -85,13 +85,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { } } - $sortID = NULL; - if ($this->get(CRM_Utils_Sort::SORT_ID)) { - $sortID = CRM_Utils_Sort::sortIDValue($this->get(CRM_Utils_Sort::SORT_ID), - $this->get(CRM_Utils_Sort::SORT_DIRECTION) - ); - } - $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); $selector = new CRM_Activity_Selector_Search($this->_queryParams, $this->_action, @@ -110,7 +103,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $controller = new CRM_Core_Selector_Controller($selector, $this->get(CRM_Utils_Pager::PAGE_ID), - $sortID, + $this->getSortID(), CRM_Core_Action::VIEW, $this, CRM_Core_Selector_Controller::TRANSFER, @@ -206,13 +199,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { return; } - $sortID = NULL; - if ($this->get(CRM_Utils_Sort::SORT_ID)) { - $sortID = CRM_Utils_Sort::sortIDValue($this->get(CRM_Utils_Sort::SORT_ID), - $this->get(CRM_Utils_Sort::SORT_DIRECTION) - ); - } - $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues); $selector = new CRM_Activity_Selector_Search($this->_queryParams, @@ -231,7 +217,7 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $controller = new CRM_Core_Selector_Controller($selector, $this->get(CRM_Utils_Pager::PAGE_ID), - $sortID, + $this->getSortID(), CRM_Core_Action::VIEW, $this, CRM_Core_Selector_Controller::SESSION,