From 46d5640f900ecebf803b2f07d48bf495a5ca09e7 Mon Sep 17 00:00:00 2001
From: Kurund Jalmi <kurundjalmi@thirdsectordesign.org>
Date: Wed, 16 Aug 2023 16:47:10 +0100
Subject: [PATCH] fatal error fixes in PHP 8.1

---
 api/v3/Profile.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/api/v3/Profile.php b/api/v3/Profile.php
index 0d2b9a5c8b..c9c0af5960 100644
--- a/api/v3/Profile.php
+++ b/api/v3/Profile.php
@@ -575,7 +575,9 @@ function _civicrm_api3_buildprofile_submitfields($profileID, $optionsBehaviour,
           }
         }
       }
-      $profileFields[$profileID][$fieldName] = array_merge($entityGetFieldsResult[$realName], $profileFields[$profileID][$entityfield]);
+      if (!empty($entityGetFieldsResult[$realName])) {
+        $profileFields[$profileID][$fieldName] = array_merge($entityGetFieldsResult[$realName], $profileFields[$profileID][$entityfield]);
+      }
       if (!isset($profileFields[$profileID][$fieldName]['api.aliases'])) {
         $profileFields[$profileID][$fieldName]['api.aliases'] = [];
       }
-- 
2.25.1