Skip to content

Commit

Permalink
Merge pull request #15756 from eileenmcnaughton/qfbug
Browse files Browse the repository at this point in the history
[REF] very minor tidy up
  • Loading branch information
yashodha authored Nov 12, 2019
2 parents aa301f1 + 1ce8730 commit 2cfdd8e
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions CRM/Dedupe/Merger.php
Original file line number Diff line number Diff line change
Expand Up @@ -1091,8 +1091,11 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
// CRM-15681 don't display sub-types in UI
continue;
}
$rows["move_$field"]['main'] = self::getFieldValueAndLabel($field, $main)['label'];
$rows["move_$field"]['other'] = self::getFieldValueAndLabel($field, $other)['label'];
$rows["move_$field"] = [
'main' => self::getFieldValueAndLabel($field, $main)['label'],
'other' => self::getFieldValueAndLabel($field, $other)['label'],
'title' => $fields[$field]['title'],
];

$value = self::getFieldValueAndLabel($field, $other)['value'];
//CRM-14334
Expand Down Expand Up @@ -1120,7 +1123,6 @@ public static function getRowsElementsAndInfo($mainId, $otherId, $checkPermissio
}

$migrationInfo["move_$field"] = $value;
$rows["move_$field"]['title'] = $fields[$field]['title'];
}

// Handle location blocks.
Expand Down

0 comments on commit 2cfdd8e

Please sign in to comment.