From 19cea1b401d462eb1d710634914eeaf92d697938 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 21 Oct 2020 17:45:20 +1300 Subject: [PATCH] Minor code cleanup - dedupe isNull checks The code goes through 3 rounds of goin through each param & pruning it. In this case the second 2 of these both skip any isNull values so combining them & keeping the strictest makes sense --- CRM/Member/Import/Parser/Membership.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CRM/Member/Import/Parser/Membership.php b/CRM/Member/Import/Parser/Membership.php index 5acd0d7166..9ad37029bf 100644 --- a/CRM/Member/Import/Parser/Membership.php +++ b/CRM/Member/Import/Parser/Membership.php @@ -327,7 +327,8 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { $formatValues = []; foreach ($params as $key => $field) { - if ($field == NULL || $field === '') { + // ignore empty values or empty arrays etc + if (CRM_Utils_System::isNull($field)) { continue; } @@ -621,10 +622,6 @@ class CRM_Member_Import_Parser_Membership extends CRM_Member_Import_Parser { $customFields = CRM_Core_BAO_CustomField::getFields('Membership'); foreach ($params as $key => $value) { - // ignore empty values or empty arrays etc - if (CRM_Utils_System::isNull($value)) { - continue; - } //Handling Custom Data if ($customFieldID = CRM_Core_BAO_CustomField::getKeyID($key)) { -- 2.25.1