Minor cleanup on household merge properties

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index ad62043964c99167bb85aff486526989ec876dc8..587c1c73376cc448243b60018dc480b7037bac9f 100644 (file)
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -228,11 +228,7 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
     list($query, $select, $from, $where, $having) = $processor->runQuery($params, $order, $returnProperties);
 
     if ($mergeSameHousehold == 1) {
-      if (empty($returnProperties['id'])) {
-        $returnProperties['id'] = 1;
-      }
-
-      $processor->setHouseholdMergeReturnProperties(array_diff_key($returnProperties, array_fill_keys(['location_type', 'im_provider'], 1)));
+      $processor->setHouseholdMergeReturnProperties($returnProperties);
     }
 
     // This perhaps only needs calling when $mergeSameHousehold == 1

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index a58784792175994fec1526ee27232576c14e73c4..7e71e1cecb144ef5150254da7a3281ddc9b8bae3 100644 (file)
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1211,6 +1211,7 @@ class CRM_Export_BAO_ExportProcessor {
    * @param $returnProperties
    */
   public function setHouseholdMergeReturnProperties($returnProperties) {
+    $returnProperties = array_diff_key($returnProperties, array_fill_keys(['location_type', 'im_provider'], 1));
     foreach ($this->getHouseholdRelationshipTypes() as $householdRelationshipType) {
       $this->relationshipReturnProperties[$householdRelationshipType] = $returnProperties;
     }
@@ -1580,6 +1581,9 @@ class CRM_Export_BAO_ExportProcessor {
     else {
       $returnProperties = $this->getDefaultReturnProperties();
     }
+    if ($this->isMergeSameHousehold()) {
+      $returnProperties['id'] = 1;
+    }
     if ($this->isMergeSameAddress()) {
       $returnProperties['addressee'] = 1;
       $returnProperties['postal_greeting'] = 1;