From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 2 Jun 2020 01:18:29 +0000 (+1200)
Subject: dev/core#1780 Fix bug where non-household merge contacts were being skipped
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=69edd19f948f0705e8416c77f80cc8bd9486f513;p=civicrm-core.git

dev/core#1780 Fix bug where non-household merge contacts were being skipped
---

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index 31ad915d3e..100b8892ed 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -498,7 +498,7 @@ class CRM_Export_BAO_ExportProcessor {
    */
   public function setRelationshipValue($relationshipType, $contactID, $field, $value) {
     $this->relatedContactValues[$relationshipType][$contactID][$field] = $value;
-    if ($field === 'id') {
+    if ($field === 'id' && $this->isHouseholdMergeRelationshipTypeKey($relationshipType)) {
       $this->householdsToSkip[] = $value;
     }
   }