From 3611a5326401113aca7fee86badf926c1dd75c6e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Thu, 11 Jul 2019 01:04:42 +1200
Subject: [PATCH] Move setting of household properties to processor

---
 CRM/Export/BAO/Export.php          |  4 ----
 CRM/Export/BAO/ExportProcessor.php | 11 +++++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 4b5e3232f0..964aad576a 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -210,10 +210,6 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
 
     list($query, $select, $from, $where, $having) = $processor->runQuery($params, $order);
 
-    if ($mergeSameHousehold == 1) {
-      $processor->setHouseholdMergeReturnProperties();
-    }
-
     // This perhaps only needs calling when $mergeSameHousehold == 1
     self::buildRelatedContactArray($selectAll, $ids, $processor, $componentTable);
 
diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index aa4e0b3639..f06992ddfa 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -310,6 +310,7 @@ class CRM_Export_BAO_ExportProcessor {
     $this->setReturnProperties($this->determineReturnProperties());
     $this->setAdditionalFieldsForSameAddressMerge();
     $this->setAdditionalFieldsForPostalExport();
+    $this->setHouseholdMergeReturnProperties();
   }
 
   /**
@@ -1220,10 +1221,12 @@ class CRM_Export_BAO_ExportProcessor {
    * be retrieved.
    */
   public function setHouseholdMergeReturnProperties() {
-    $returnProperties = $this->getReturnProperties();
-    $returnProperties = array_diff_key($returnProperties, array_fill_keys(['location_type', 'im_provider'], 1));
-    foreach ($this->getHouseholdRelationshipTypes() as $householdRelationshipType) {
-      $this->relationshipReturnProperties[$householdRelationshipType] = $returnProperties;
+    if ($this->isMergeSameHousehold()) {
+      $returnProperties = $this->getReturnProperties();
+      $returnProperties = array_diff_key($returnProperties, array_fill_keys(['location_type', 'im_provider'], 1));
+      foreach ($this->getHouseholdRelationshipTypes() as $householdRelationshipType) {
+        $this->relationshipReturnProperties[$householdRelationshipType] = $returnProperties;
+      }
     }
   }
 
-- 
2.25.1