Skip to content

Commit

Permalink
Check field to carry over custom data by default when none is
Browse files Browse the repository at this point in the history
in the other contact's field

This partially addresses reviewer feedback about the limitations of civicrm#15595
  • Loading branch information
eileenmcnaughton committed Jan 9, 2020
1 parent c77f9b1 commit 97be189
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions CRM/Dedupe/Merger.php
Original file line number Diff line number Diff line change
Expand Up @@ -1383,12 +1383,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;
}
Expand Down

0 comments on commit 97be189

Please sign in to comment.