projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
eaba3c3
)
dev/core#1780 Fix bug where non-household merge contacts were being skipped
author
eileen
<emcnaughton@wikimedia.org>
Tue, 2 Jun 2020 01:18:29 +0000
(13:18 +1200)
committer
eileen
<emcnaughton@wikimedia.org>
Tue, 2 Jun 2020 01:18:29 +0000
(13:18 +1200)
CRM/Export/BAO/ExportProcessor.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Export/BAO/ExportProcessor.php
b/CRM/Export/BAO/ExportProcessor.php
index 31ad915d3e2d6ba2a63f1cc223e2550be4d1f71d..100b8892edcd49c072e36022d48312f1718b5399 100644
(file)
--- 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;
}
}