From d28b6cf200e4cf2e27b8388925171eb53afbbb45 Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Wed, 18 Jul 2018 23:47:29 +1200
Subject: [PATCH] Export: refactor default return properties retrieval to the
 Processor class

---
 CRM/Export/BAO/Export.php          | 26 +-------------------------
 CRM/Export/BAO/ExportProcessor.php |  4 ++++
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 7614d268c4..4a25bfbee3 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -399,31 +399,7 @@ class CRM_Export_BAO_Export {
       }
     }
     else {
-      $returnProperties = [];
-      $fields = CRM_Contact_BAO_Contact::exportableFields('All', TRUE, TRUE);
-      foreach ($fields as $key => $var) {
-        if ($key && (substr($key, 0, 6) != 'custom')) {
-          //for CRM=952
-          $returnProperties[$key] = 1;
-        }
-      }
-
-      $returnProperties = array_merge($returnProperties, $processor->getAdditionalReturnProperties());
-
-      if ($queryMode != CRM_Contact_BAO_Query::MODE_CONTACTS) {
-        // unset non exportable fields for components
-        $nonExpoFields = array(
-          'groups',
-          'tags',
-          'notes',
-          'contribution_status_id',
-          'pledge_status_id',
-          'pledge_payment_status_id',
-        );
-        foreach ($nonExpoFields as $value) {
-          unset($returnProperties[$value]);
-        }
-      }
+      $returnProperties = $processor->getDefaultReturnProperties();
     }
 
     if ($mergeSameAddress) {
diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index 449792fdb3..fe9b75fa88 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -234,12 +234,16 @@ class CRM_Export_BAO_ExportProcessor {
     }
     if ($this->getQueryMode() === CRM_Contact_BAO_Query::MODE_PLEDGE) {
       $componentSpecificFields = array_merge($componentSpecificFields, CRM_Pledge_BAO_Query::extraReturnProperties($this->getQueryMode()));
+      unset($componentSpecificFields['contribution_status_id']);
+      unset($componentSpecificFields['pledge_status_id']);
+      unset($componentSpecificFields['pledge_payment_status_id']);
     }
     if ($this->getQueryMode() === CRM_Contact_BAO_Query::MODE_CASE) {
       $componentSpecificFields = array_merge($componentSpecificFields, CRM_Case_BAO_Query::extraReturnProperties($this->getQueryMode()));
     }
     if ($this->getQueryMode() === CRM_Contact_BAO_Query::MODE_CONTRIBUTE) {
       $componentSpecificFields = array_merge($componentSpecificFields, CRM_Contribute_BAO_Query::softCreditReturnProperties(TRUE));
+      unset($componentSpecificFields['contribution_status_id']);
     }
     return array_merge(array_fill_keys($missing, 1), $componentSpecificFields);
   }
-- 
2.25.1