Merge pull request #9187 from sqweets/ExportHeadersRelationships

CRM-19472 - Export headers for relationships are in machine name format
civicrm · Oct 14, 2016 · 251deab · 251deab
2 parents 0d418e2 + 7404541
commit 251deab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
@@ -2058,7 +2058,6 @@ public static function setHeaderRows($field, $headerRows, $sqlColumns, $query, $
       }
     }
     elseif (array_key_exists($field, $contactRelationshipTypes)) {
-      self::manipulateHeaderRows($headerRows, $contactRelationshipTypes);
       foreach ($value as $relationField => $relationValue) {
         // below block is same as primary block (duplicate)
         if (isset($relationQuery[$field]->_fields[$relationField]['title'])) {
@@ -2116,6 +2115,7 @@ public static function setHeaderRows($field, $headerRows, $sqlColumns, $query, $
           }
         }
       }
+      self::manipulateHeaderRows($headerRows, $contactRelationshipTypes);
     }
     elseif ($selectedPaymentFields && array_key_exists($field, self::componentPaymentFields())) {
       $headerRows[] = CRM_Utils_Array::value($field, self::componentPaymentFields());