Merge pull request #16246 from eileenmcnaughton/dedupe2

Check field to carry over custom data by default when the other contact has none
civicrm · Jan 14, 2020 · 6fb9450 · 6fb9450
2 parents 8001ada + 97be189
commit 6fb9450
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php
@@ -1196,12 +1196,13 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
           $rows["move_custom_$fid"]['title'] = $field['label'];
 
           $elements[] = [
-            'advcheckbox',
-            "move_custom_$fid",
-            NULL,
-            NULL,
-            NULL,
-            $value,
+            0 => 'advcheckbox',
+            1 => "move_custom_$fid",
+            2 => NULL,
+            3 => NULL,
+            4 => NULL,
+            5 => $value,
+            'is_checked' => (!isset($rows["move_custom_$fid"]['main']) || $rows["move_custom_$fid"]['main'] === ''),
           ];
           $migrationInfo["move_custom_$fid"] = $value;
         }