From 606f3c49306fe0fbcd828ae07f02111ba12a326d Mon Sep 17 00:00:00 2001 From: Eli Lisseck Date: Thu, 1 Jun 2017 16:41:14 -0400 Subject: [PATCH] CRM-20672 incorrect editor settings. Changed tabs to spaces --- CRM/Core/BAO/Mapping.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/CRM/Core/BAO/Mapping.php b/CRM/Core/BAO/Mapping.php index 403a08535c..7dcced6e42 100644 --- a/CRM/Core/BAO/Mapping.php +++ b/CRM/Core/BAO/Mapping.php @@ -602,13 +602,13 @@ class CRM_Core_BAO_Mapping extends CRM_Core_DAO_Mapping { elseif (isset($relationshipType->$target_type)) { $relatedFields = array_merge((array) $relatedMapperFields[$relationshipType->$target_type], (array) $relationshipCustomFields); } - //CRM-20672 If contact target type not set e.g. "All Contacts" relationship - present user with all field options and let them determine what they expect to work - else { - foreach ($contactTypes as $contactType => $label) { - $relatedFields = array_merge($relatedFields, (array) $relatedMapperFields[$label]); - } - $relatedFields = array_merge($relatedFields, (array) $relationshipCustomFields); - } + //CRM-20672 If contact target type not set e.g. "All Contacts" relationship - present user with all field options and let them determine what they expect to work + else { + foreach ($contactTypes as $contactType => $label) { + $relatedFields = array_merge($relatedFields, (array) $relatedMapperFields[$label]); + } + $relatedFields = array_merge($relatedFields, (array) $relationshipCustomFields); + } } $relationshipType->free(); asort($relatedFields); -- 2.25.1