From f7ccbf0acbae2b0410ef1d7e74eac0e868806075 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 12 Apr 2022 12:45:28 +1200 Subject: [PATCH] Remove some copy & paste --- CRM/Event/Import/Form/MapField.php | 12 ------------ CRM/Member/Import/Form/MapField.php | 10 ---------- 2 files changed, 22 deletions(-) diff --git a/CRM/Event/Import/Form/MapField.php b/CRM/Event/Import/Form/MapField.php index bf7472a1af..10cb022d38 100644 --- a/CRM/Event/Import/Form/MapField.php +++ b/CRM/Event/Import/Form/MapField.php @@ -404,12 +404,6 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField { $updateMappingFields->id = $mappingFieldsId[$i]; $updateMappingFields->mapping_id = $params['mappingId']; $updateMappingFields->column_number = $i; - - $explodedValues = explode('_', $mapperKeys[$i][0]); - $id = $explodedValues[0] ?? NULL; - $first = $explodedValues[1] ?? NULL; - $second = $explodedValues[2] ?? NULL; - $updateMappingFields->name = $mapper[$i]; $updateMappingFields->save(); } @@ -428,12 +422,6 @@ class CRM_Event_Import_Form_MapField extends CRM_Import_Form_MapField { $saveMappingFields = new CRM_Core_DAO_MappingField(); $saveMappingFields->mapping_id = $saveMapping->id; $saveMappingFields->column_number = $i; - - $explodedValues = explode('_', $mapperKeys[$i][0]); - $id = $explodedValues[0] ?? NULL; - $first = $explodedValues[1] ?? NULL; - $second = $explodedValues[2] ?? NULL; - $saveMappingFields->name = $mapper[$i]; $saveMappingFields->save(); } diff --git a/CRM/Member/Import/Form/MapField.php b/CRM/Member/Import/Form/MapField.php index c06c9afeeb..352cc47458 100644 --- a/CRM/Member/Import/Form/MapField.php +++ b/CRM/Member/Import/Form/MapField.php @@ -446,11 +446,6 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField { $updateMappingFields->id = $mappingFieldsId[$i]; $updateMappingFields->mapping_id = $params['mappingId']; $updateMappingFields->column_number = $i; - - $mapperKeyParts = explode('_', $mapperKeys[$i][0], 3); - $id = $mapperKeyParts[0] ?? NULL; - $first = $mapperKeyParts[1] ?? NULL; - $second = $mapperKeyParts[2] ?? NULL; $updateMappingFields->name = $mapper[$i]; $updateMappingFields->save(); } @@ -470,11 +465,6 @@ class CRM_Member_Import_Form_MapField extends CRM_Import_Form_MapField { $saveMappingFields = new CRM_Core_DAO_MappingField(); $saveMappingFields->mapping_id = $saveMapping->id; $saveMappingFields->column_number = $i; - - $mapperKeyParts = explode('_', $mapperKeys[$i][0], 3); - $id = $mapperKeyParts[0] ?? NULL; - $first = $mapperKeyParts[1] ?? NULL; - $second = $mapperKeyParts[2] ?? NULL; $saveMappingFields->name = $mapper[$i]; $saveMappingFields->save(); } -- 2.25.1