From 80d88315822e17523e5286145dcbfe73b3da7a1d Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 14 Jun 2019 16:58:05 -0400
Subject: [PATCH] Fix intermittent test fail on NULL array getting contaminated
 & causing later tests to pass the wrong thing

---
 CRM/Contact/BAO/Contact.php | 2 +-
 CRM/Dedupe/Merger.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 2640fdedf95b..b7e5dace1253 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -1960,7 +1960,7 @@ public static function getContactDetails($id) {
    */
   public static function createProfileContact(
     &$params,
-    &$fields,
+    &$fields = [],
     $contactID = NULL,
     $addToGroupID = NULL,
     $ufGroupId = NULL,
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
index e6b07b91435a..ac26749cdb5e 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1679,8 +1679,8 @@ public static function moveAllBelongings($mainId, $otherId, $migrationInfo, $che
       if (!isset($submitted['suffix_id']) && !empty($migrationInfo['main_details']['suffix_id'])) {
         $submitted['suffix_id'] = $migrationInfo['main_details']['suffix_id'];
       }
-
-      CRM_Contact_BAO_Contact::createProfileContact($submitted, CRM_Core_DAO::$_nullArray, $mainId);
+      $null = NULL;
+      CRM_Contact_BAO_Contact::createProfileContact($submitted, $null, $mainId);
     }
     $transaction->commit();
     CRM_Utils_Hook::post('merge', 'Contact', $mainId);