From cc0985995e2cd36b5d4ea189e3eb9a5ab5bd8884 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Tue, 27 Dec 2022 11:09:36 +1300
Subject: [PATCH] Stop returning unaltered cFields parameter

---
 CRM/Dedupe/Merger.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index 9dfec97e9f..935ed72557 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1783,7 +1783,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       $submitted = [];
     }
     foreach ($submitted as $key => $value) {
-      [$cFields, $submitted] = self::processCustomFields($mainId, $key, $cFields, $submitted, $value);
+      $submitted = self::processCustomFields($mainId, $key, $cFields, $submitted, $value);
     }
 
     // move view only custom fields CRM-5362
@@ -2206,7 +2206,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
     if (substr($key, 0, 7) === 'custom_') {
       $fid = (int) substr($key, 7);
       if (empty($cFields[$fid])) {
-        return [$cFields, $submitted];
+        return $submitted;
       }
       $htmlType = $cFields[$fid]['attributes']['html_type'];
       $isSerialized = CRM_Core_BAO_CustomField::isSerialized($cFields[$fid]['attributes']);
@@ -2277,7 +2277,7 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
         }
       }
     }
-    return [$cFields, $submitted];
+    return $submitted;
   }
 
   /**
-- 
2.25.1