From 7668e37a857273efaa93407ab9fd70828e679186 Mon Sep 17 00:00:00 2001 From: eileen Date: Sun, 17 Feb 2019 18:18:33 +1300 Subject: [PATCH] As previously commented this array is never used. I did a codebase grep on ->defaults & am pretty confident here.... --- CRM/Activity/Form/Search.php | 1 - CRM/Case/Form/Search.php | 1 - CRM/Contribute/Form/Search.php | 2 -- CRM/Event/Form/Search.php | 1 - CRM/Grant/Form/Search.php | 1 - CRM/Member/Form/Search.php | 2 -- CRM/Pledge/Form/Search.php | 1 - 7 files changed, 9 deletions(-) diff --git a/CRM/Activity/Form/Search.php b/CRM/Activity/Form/Search.php index f59e18c13b..714a68eed0 100644 --- a/CRM/Activity/Form/Search.php +++ b/CRM/Activity/Form/Search.php @@ -87,7 +87,6 @@ class CRM_Activity_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); diff --git a/CRM/Case/Form/Search.php b/CRM/Case/Form/Search.php index df38d23fcf..14ca731cc0 100644 --- a/CRM/Case/Form/Search.php +++ b/CRM/Case/Form/Search.php @@ -87,7 +87,6 @@ class CRM_Case_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); $this->loadFormValues(); diff --git a/CRM/Contribute/Form/Search.php b/CRM/Contribute/Form/Search.php index 9e55c4839a..f00ec96621 100644 --- a/CRM/Contribute/Form/Search.php +++ b/CRM/Contribute/Form/Search.php @@ -80,8 +80,6 @@ class CRM_Contribute_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - // @todo - is this an error - $this->_defaults is used. - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); diff --git a/CRM/Event/Form/Search.php b/CRM/Event/Form/Search.php index 5b28568a91..0f13d9eb8d 100644 --- a/CRM/Event/Form/Search.php +++ b/CRM/Event/Form/Search.php @@ -88,7 +88,6 @@ class CRM_Event_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); $this->loadFormValues(); diff --git a/CRM/Grant/Form/Search.php b/CRM/Grant/Form/Search.php index 2f52f3e3b6..5981f0d213 100644 --- a/CRM/Grant/Form/Search.php +++ b/CRM/Grant/Form/Search.php @@ -89,7 +89,6 @@ class CRM_Grant_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); $this->loadFormValues(); diff --git a/CRM/Member/Form/Search.php b/CRM/Member/Form/Search.php index ed2894040a..3f98247a5c 100644 --- a/CRM/Member/Form/Search.php +++ b/CRM/Member/Form/Search.php @@ -82,8 +82,6 @@ class CRM_Member_Form_Search extends CRM_Core_Form_Search { $this->_done = FALSE; - $this->defaults = array(); - $this->loadStandardSearchOptionsFromUrl(); // get user submitted values diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php index 33291408d4..3d00901f12 100644 --- a/CRM/Pledge/Form/Search.php +++ b/CRM/Pledge/Form/Search.php @@ -71,7 +71,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search { $this->_actionButtonName = $this->getButtonName('next', 'action'); $this->_done = FALSE; - $this->defaults = array(); $this->loadStandardSearchOptionsFromUrl(); -- 2.25.1