Skip to content

Commit

Permalink
Remove always-NULL singleRecord
Browse files Browse the repository at this point in the history
  • Loading branch information
eileenmcnaughton committed Feb 7, 2023
1 parent 256615e commit a641640
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions CRM/Dedupe/Merger.php
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@ public static function getTree(
// add info to groupTree

if (isset($groupTree['info']) && !empty($groupTree['info']) &&
!empty($groupTree['info']['tables']) && $singleRecord != 'new'
!empty($groupTree['info']['tables'])
) {
$select = $from = $where = [];
$groupTree['info']['where'] = NULL;
Expand Down Expand Up @@ -1978,7 +1978,7 @@ public static function getTree(
}
$multipleFieldTablesWithEntityData = array_keys($entityMultipleSelectClauses);
if (!empty($multipleFieldTablesWithEntityData)) {
CRM_Core_BAO_CustomGroup::buildEntityTreeMultipleFields($groupTree, $entityID, $entityMultipleSelectClauses, $multipleFieldTablesWithEntityData, $singleRecord);
CRM_Core_BAO_CustomGroup::buildEntityTreeMultipleFields($groupTree, $entityID, $entityMultipleSelectClauses, $multipleFieldTablesWithEntityData);
}

}
Expand Down

0 comments on commit a641640

Please sign in to comment.