From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 14 Jun 2019 20:58:05 +0000 (-0400)
Subject: Fix intermittent test fail on NULL array getting contaminated & causing later tests... 
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=9b0e7e51e4dde3ef7eddd3dea0478bff2541c1cb;p=civicrm-core.git

Fix intermittent test fail on NULL array getting contaminated & causing later tests to pass the wrong thing
---

diff --git a/CRM/Contact/BAO/Contact.php b/CRM/Contact/BAO/Contact.php
index 2640fdedf9..b7e5dace12 100644
--- a/CRM/Contact/BAO/Contact.php
+++ b/CRM/Contact/BAO/Contact.php
@@ -1960,7 +1960,7 @@ ORDER BY civicrm_email.is_primary DESC";
    */
   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 e6b07b9143..20b5711a8a 100644
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@ -1679,8 +1679,8 @@ INNER JOIN  civicrm_membership membership2 ON membership1.membership_type_id = m
       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 = [];
+      CRM_Contact_BAO_Contact::createProfileContact($submitted, $null, $mainId);
     }
     $transaction->commit();
     CRM_Utils_Hook::post('merge', 'Contact', $mainId);