From 46413c06c7defe7e8d0376bc980028d213a25223 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 31 Aug 2023 08:44:00 +1200 Subject: [PATCH] Stop calling -do-nothing pre-process --- CRM/Contact/Form/Location.php | 8 -------- CRM/Event/Form/ManageEvent/Location.php | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/CRM/Contact/Form/Location.php b/CRM/Contact/Form/Location.php index 02ea8de4f0..0a70e88020 100644 --- a/CRM/Contact/Form/Location.php +++ b/CRM/Contact/Form/Location.php @@ -33,14 +33,6 @@ class CRM_Contact_Form_Location { $form->set($form->_addBlockName . '_Block_Count', $additionalblockCount); } - if (is_a($form, 'CRM_Event_Form_ManageEvent_Location')) { - $form->_blocks = [ - 'Address' => ts('Address'), - 'Email' => ts('Email'), - 'Phone' => ts('Phone'), - ]; - } - $form->assign('blocks', $form->_blocks); $form->assign('className', CRM_Utils_System::getClassName($form)); diff --git a/CRM/Event/Form/ManageEvent/Location.php b/CRM/Event/Form/ManageEvent/Location.php index 02f363c48b..90faa0cc98 100644 --- a/CRM/Event/Form/ManageEvent/Location.php +++ b/CRM/Event/Form/ManageEvent/Location.php @@ -75,7 +75,7 @@ class CRM_Event_Form_ManageEvent_Location extends CRM_Event_Form_ManageEvent { } //location blocks. - CRM_Contact_Form_Location::preProcess($this); + $this->assign('addressSequence', CRM_Core_BAO_Address::addressSequence()); } /** -- 2.25.1