From 25e51a1c7d03eed136ac3fd3de12a040007e6124 Mon Sep 17 00:00:00 2001 From: eileen Date: Wed, 10 Jul 2019 13:28:50 +1200 Subject: [PATCH] Minor cleanup on household merge properties --- CRM/Export/BAO/Export.php | 6 +----- CRM/Export/BAO/ExportProcessor.php | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index ad62043964..587c1c7337 100644 --- 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 a587847921..7e71e1cecb 100644 --- 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; -- 2.25.1