CRM-20672 incorrect editor settings. Changed tabs to spaces
authorEli Lisseck <lisseck@gmail.com>
Thu, 1 Jun 2017 20:41:14 +0000 (16:41 -0400)
committerEli Lisseck <lisseck@gmail.com>
Thu, 1 Jun 2017 20:41:14 +0000 (16:41 -0400)
CRM/Core/BAO/Mapping.php

index 403a08535c00a9c5075fb94f7a44f71f57059b61..7dcced6e42ba34101096fd45f7c4ef0d6bc10d65 100644 (file)
@@ -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);