Fix intermittent test fail on NULL array getting contaminated & causi…

…ng later tests to pass the wrong thing
civicrm · Jun 14, 2019 · 80d8831 · 80d8831
1 parent 204a280
commit 80d8831
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);