From: Ellen Hendricks <ellen.hendricks@sprydigital.com>
Date: Fri, 14 Oct 2016 14:40:33 +0000 (-0500)
Subject: CRM-19472 Moved call to manipulateHeadeRows to right after the  are built
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=74045414056c69e52eaca88a32e9cfe2e0b61ad4;p=civicrm-core.git

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 5b1d2b686f..8be3c55b4e 100644
--- 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);