From d5f547f815c21e5e2b8a370af462252ee19912cd Mon Sep 17 00:00:00 2001 From: eileenmcnaugton Date: Fri, 16 Oct 2015 14:45:37 +1300 Subject: [PATCH] CRM-17352 fix strict error on non-static method I could only find one place where this is called & it didn't seem to be as a form in itself. Arguably the class should go & just be a couple of functions on the one form that calls it --- CRM/Contact/Form/Task/ProximityCommon.php | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/CRM/Contact/Form/Task/ProximityCommon.php b/CRM/Contact/Form/Task/ProximityCommon.php index c4dc52aa97..759c5b657b 100644 --- a/CRM/Contact/Form/Task/ProximityCommon.php +++ b/CRM/Contact/Form/Task/ProximityCommon.php @@ -34,7 +34,7 @@ /** * This class provides the functionality to support Proximity Searches. */ -class CRM_Contact_Form_Task_ProximityCommon extends CRM_Contact_Form_Task { +class CRM_Contact_Form_Task_ProximityCommon { /** * The context that we are working on. @@ -57,21 +57,13 @@ class CRM_Contact_Form_Task_ProximityCommon extends CRM_Contact_Form_Task { */ protected $_title; - /** - * Build all the data structures needed to build the form. - */ - public function preProcess() { - // initialize the task and row fields - parent::preProcess(); - } - /** * Build the form object. * * @param CRM_Core_Form $form * @param int $proxSearch */ - public function buildQuickForm($form, $proxSearch) { + static public function buildQuickForm($form, $proxSearch) { // is proximity search required (2) or optional (1)? $proxRequired = ($proxSearch == 2 ? TRUE : FALSE); $form->assign('proximity_search', TRUE); @@ -128,13 +120,12 @@ class CRM_Contact_Form_Task_ProximityCommon extends CRM_Contact_Form_Task { /** * Set the default form values. * - * * @param CRM_Core_Form $form * * @return array * the default array reference */ - public function setDefaultValues($form) { + static public function setDefaultValues($form) { $defaults = array(); $config = CRM_Core_Config::singleton(); $countryDefault = $config->defaultContactCountry; -- 2.25.1