From: eileen <emcnaughton@wikimedia.org>
Date: Mon, 12 Nov 2018 04:40:02 +0000 (+1300)
Subject: Export code cleanup -remove meaningless code
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=0f7d64d0b763d9c98e5b55e9fb79e22b38465942;p=civicrm-core.git

Export code cleanup -remove meaningless code
---

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 00214262af..c5e82945f7 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -1400,17 +1400,7 @@ WHERE  {$whereClause}";
         foreach ($value as $relationField => $relationValue) {
           // below block is same as primary block (duplicate)
           if (isset($queryFields[$relationField]['title'])) {
-            if ($queryFields[$relationField]['name'] == 'name') {
-              $headerName = $field . '-' . $relationField;
-            }
-            else {
-              if ($relationField == 'current_employer') {
-                $headerName = $field . '-' . 'current_employer';
-              }
-              else {
-                $headerName = $field . '-' . $relationField;
-              }
-            }
+            $headerName = $field . '-' . $relationField;
 
             if (!$processor->isHouseholdMergeRelationshipTypeKey($field)) {
               // Do not add to header row if we are only generating for merge reasons.