From: kurund <kurund@civicrm.org>
Date: Mon, 2 Feb 2015 13:10:24 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=82e7a8b8a4054c4814900ddf5e8fc56d6819c134;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

Conflicts:
	CRM/Dedupe/Merger.php
---

82e7a8b8a4054c4814900ddf5e8fc56d6819c134
diff --cc CRM/Dedupe/Merger.php
index 45f520e799,3f926f7589..9c938ebaf6
--- a/CRM/Dedupe/Merger.php
+++ b/CRM/Dedupe/Merger.php
@@@ -746,11 -743,10 +746,9 @@@ INNER JOIN  civicrm_membership membersh
          // Rule: resolve address conflict if any -
          if ($fieldName == 'address') {
            $mainNewLocTypeId = $migrationInfo['location'][$fieldName][$fieldCount]['locTypeId'];
-           if (!empty($migrationInfo['main_loc_address']) &&
-             array_key_exists("main_{$mainNewLocTypeId}", $migrationInfo['main_loc_address'])
-           ) {
+           if (!empty($migrationInfo['main_loc_block']) &&
+               array_key_exists("main_address{$mainNewLocTypeId}", $migrationInfo['main_loc_block'])) {
              // main loc already has some address for the loc-type. Its a overwrite situation.
--
              // look for next available loc-type
              $newTypeId = NULL;
              foreach ($allLocationTypes as $typeId => $typeLabel) {