From 3bc3213328bf989bcdf174b11fea41b4282da63f Mon Sep 17 00:00:00 2001 From: JKingsnorth Date: Fri, 20 Nov 2015 16:23:16 +0000 Subject: [PATCH] Minor style fixes --- CRM/Dedupe/Merger.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 085ef2942e..e97d68d4e0 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1108,7 +1108,6 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m 'other' => $otherId, ); - foreach ($locationBlocks as $blockName => $blockInfo) { // Collect existing fields from both 'main' and 'other' contacts first @@ -1272,16 +1271,15 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m 2 => $count, 3 => $thisLocId ? $listOptions['location_type_id'][$thisLocId] : ''; 4 => $thisTypeId ? $listOptions[$blockInfo['hasType']][$thisTypeId] : ''; - ) - ); + )); - // End loop through 'other' locations of this type + // End loop through 'other' locations of this type } - // End if 'other' location for this type exists + // End if 'other' location for this type exists } - // End loop through each location block entity + // End loop through each location block entity } // @todo NEW REFACOTRING DONE UP TO HERE -- 2.25.1