From a50d7d84b5970e26261fe3134a10c7f91dcb5e56 Mon Sep 17 00:00:00 2001 From: Sudha Bisht Date: Fri, 4 Dec 2015 13:24:39 +0530 Subject: [PATCH] Fix for CRM failure --- CRM/Dedupe/Merger.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CRM/Dedupe/Merger.php b/CRM/Dedupe/Merger.php index 189dc5b05a..e97cac8cec 100644 --- a/CRM/Dedupe/Merger.php +++ b/CRM/Dedupe/Merger.php @@ -1492,7 +1492,7 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m // @todo Tidy this up $operation = 0; if ($fieldName != 'website') { - $operation = CRM_Utils_Array::value('operation', $migrationInfo['location'][$fieldName][$fieldCount]); + $operation = CRM_Utils_Array::value('operation', $migrationInfo['location_blocks'][$fieldName][$fieldCount]); } // default operation is overwrite. if (!$operation) { @@ -1546,16 +1546,16 @@ INNER JOIN civicrm_membership membership2 ON membership1.membership_type_id = m // Add/update location and type information from the form, if applicable if ($locationBlocks[$name]['hasLocation']) { - $locTypeId = CRM_Utils_Array::value('locTypeId', $migrationInfo['location'][$name][$blkCount]); + $locTypeId = CRM_Utils_Array::value('locTypeId', $migrationInfo['location_blocks'][$name][$blkCount]); $otherBlockDAO->location_type_id = $locTypeId; } if ($locationBlocks[$name]['hasType']) { - $typeTypeId = CRM_Utils_Array::value('typeTypeId', $migrationInfo['location'][$name][$blkCount]); + $typeTypeId = CRM_Utils_Array::value('typeTypeId', $migrationInfo['location_blocks'][$name][$blkCount]); $otherBlockDAO->{$locationBlocks[$name]['hasType']} = $typeTypeId; } // Get main block ID - $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location'][$name][$blkCount], 0); + $mainBlockId = CRM_Utils_Array::value('mainContactBlockId', $migrationInfo['location_blocks'][$name][$blkCount], 0); // if main contact already has primary & billing, set the flags to 0. if ($primaryDAOId) { -- 2.25.1