From c536312185bab3e22edb0cf5f8f52dbb86a40982 Mon Sep 17 00:00:00 2001
From: Marc Michalsky forumZFD <michalsky@forumzfd.de>
Date: Tue, 13 Oct 2020 14:57:22 +0200
Subject: [PATCH] check custom field for NULL before insert it into custom
 field mapping

---
 CRM/TwingleCampaign/Upgrader/BAO/CustomField.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php b/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php
index a775d8c..68c2c51 100644
--- a/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php
+++ b/CRM/TwingleCampaign/Upgrader/BAO/CustomField.php
@@ -230,7 +230,9 @@ class CustomField {
     $customFieldMapping = [];
 
     foreach ($customFields as $customField) {
-      $customFieldMapping[$customField->getName()] = 'custom_' . $customField->getId();
+      if ($customField) {
+        $customFieldMapping[$customField->getName()] = 'custom_' . $customField->getId();
+      }
     }
 
     return $customFieldMapping;