Merge pull request #14802 from eileenmcnaughton/ex4

[REF] [Export] Move setting of household properties to processor
civicrm · Jul 11, 2019 · 46a36ce · 46a36ce
2 parents 561070c + 3611a53
commit 46a36ce
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
@@ -212,10 +212,6 @@ public static function exportComponents(
 
     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
@@ -310,6 +310,7 @@ public function __construct($exportMode, $requestedFields, $queryOperator, $isMe
     $this->setReturnProperties($this->determineReturnProperties());
     $this->setAdditionalFieldsForSameAddressMerge();
     $this->setAdditionalFieldsForPostalExport();
+    $this->setHouseholdMergeReturnProperties();
   }
 
   /**
@@ -1220,10 +1221,12 @@ public function setRelationshipReturnProperties($value, $relationshipKey) {
    * 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;
+      }
     }
   }