CRM-19472 Moved call to manipulateHeadeRows to right after the are built

----------------------------------------
* CRM-19472: Export headers for relationships are in "machine name" format
  https://issues.civicrm.org/jira/browse/CRM-19472

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 5b1d2b686fc55c1ec0867caa0587497a73cbb4f4..8be3c55b4e74c1e52edf17694026d1dc55465d96 100644 (file)
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -2109,6 +2109,7 @@ WHERE  {$whereClause}";
           }
         }
       }
+      self::manipulateHeaderRows($headerRows, $contactRelationshipTypes);
     }
     elseif ($selectedPaymentFields && array_key_exists($field, self::componentPaymentFields())) {
       $headerRows[] = CRM_Utils_Array::value($field, self::componentPaymentFields());
@@ -2117,8 +2118,6 @@ WHERE  {$whereClause}";
       $headerRows[] = $field;
     }
 
-    self::manipulateHeaderRows($headerRows, $contactRelationshipTypes);
-
     self::sqlColumnDefn($query, $sqlColumns, $field);
 
     return array($headerRows, $sqlColumns);