From d222986913db1d837bdf42c4716bdd7bf9642cef Mon Sep 17 00:00:00 2001 From: Stephen Palmstrom Date: Tue, 2 Jan 2024 17:47:22 +0000 Subject: [PATCH] Following suggested additional changes. --- CRM/Import/Parser.php | 5 ----- CRM/Mailing/Event/BAO/MailingEventForward.php | 5 ----- 2 files changed, 10 deletions(-) diff --git a/CRM/Import/Parser.php b/CRM/Import/Parser.php index 72031a014c..84fb798040 100644 --- a/CRM/Import/Parser.php +++ b/CRM/Import/Parser.php @@ -1128,11 +1128,6 @@ abstract class CRM_Import_Parser implements UserJobInterface { // get the formatted location blocks into params - w/ 3.0 format, CRM-4605 if (!empty($values['location_type_id'])) { - $fields = NULL; - if ($fields == NULL) { - $fields = []; - } - foreach (['Phone', 'Email', 'IM', 'OpenID', 'Phone_Ext'] as $block) { $name = strtolower($block); if (!array_key_exists($name, $values)) { diff --git a/CRM/Mailing/Event/BAO/MailingEventForward.php b/CRM/Mailing/Event/BAO/MailingEventForward.php index 6793c2f289..0b29b6a08b 100644 --- a/CRM/Mailing/Event/BAO/MailingEventForward.php +++ b/CRM/Mailing/Event/BAO/MailingEventForward.php @@ -233,11 +233,6 @@ class CRM_Mailing_Event_BAO_MailingEventForward extends CRM_Mailing_Event_DAO_Ma // get the formatted location blocks into params - w/ 3.0 format, CRM-4605 if (!empty($values['location_type_id'])) { - $fields = NULL; - if ($fields == NULL) { - $fields = []; - } - foreach (['Phone', 'Email', 'IM', 'OpenID', 'Phone_Ext'] as $block) { $name = strtolower($block); if (!array_key_exists($name, $values)) { -- 2.25.1