From 77e533a5e1e6a63c9f358252b0985bed8aa2953c Mon Sep 17 00:00:00 2001 From: eileen Date: Mon, 11 Nov 2019 15:13:03 +1300 Subject: [PATCH] [REF] extract setDeprecatedDefaults --- CRM/Contribute/Form/Search.php | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index fac69bfab0..8f47552a26 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -134,16 +134,7 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { * @throws \Exception */ public function setDefaultValues() { - $lowReceiveDate = CRM_Utils_Request::retrieve('start', 'Timestamp'); - if (!empty($lowReceiveDate)) { - $this->_formValues['receive_date_low'] = date('Y-m-d H:i:s', strtotime($lowReceiveDate)); - CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_low not start'); - } - $highReceiveDate = CRM_Utils_Request::retrieve('end', 'Timestamp'); - if (!empty($highReceiveDate)) { - $this->_formValues['receive_date_high'] = date('Y-m-d H:i:s', strtotime($highReceiveDate)); - CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_high not end'); - } + $this->setDeprecatedDefaults(); $this->_defaults = parent::setDefaultValues(); $this->_defaults = array_merge($this->getEntityDefaults('ContributionRecur'), $this->_defaults); @@ -466,4 +457,22 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $this->addSearchFieldMetadata(['ContributionRecur' => CRM_Contribute_BAO_ContributionRecur::getContributionRecurSearchFieldMetadata()]); } + /** + * Handling for url params that are deprecated. + * + * @throws \CRM_Core_Exception + */ + protected function setDeprecatedDefaults() { + $lowReceiveDate = CRM_Utils_Request::retrieve('start', 'Timestamp'); + if (!empty($lowReceiveDate)) { + $this->_formValues['receive_date_low'] = date('Y-m-d H:i:s', strtotime($lowReceiveDate)); + CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_low not start'); + } + $highReceiveDate = CRM_Utils_Request::retrieve('end', 'Timestamp'); + if (!empty($highReceiveDate)) { + $this->_formValues['receive_date_high'] = date('Y-m-d H:i:s', strtotime($highReceiveDate)); + CRM_Core_Error::deprecatedFunctionWarning('pass receive_date_high not end'); + } + } + } -- 2.25.1