From be1b6120f555dd51fd597fb3d38a8c80aab0ce50 Mon Sep 17 00:00:00 2001 From: eileen Date: Sat, 14 Jul 2018 12:29:34 +1200 Subject: [PATCH] Minor refactor preparatory to function extraction --- CRM/Export/BAO/Export.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php index 4fb071ff20..f5b946f368 100644 --- a/CRM/Export/BAO/Export.php +++ b/CRM/Export/BAO/Export.php @@ -444,7 +444,13 @@ class CRM_Export_BAO_Export { } } else { - $primary = TRUE; + $returnProperties = [ + 'location_type' => 1, + 'im_provider' => 1, + 'phone_type_id' => 1, + 'provider_id' => 1, + 'current_employer' => 1, + ]; $fields = CRM_Contact_BAO_Contact::exportableFields('All', TRUE, TRUE); foreach ($fields as $key => $var) { if ($key && (substr($key, 0, 6) != 'custom')) { @@ -453,14 +459,6 @@ class CRM_Export_BAO_Export { } } - if ($primary) { - $returnProperties['location_type'] = 1; - $returnProperties['im_provider'] = 1; - $returnProperties['phone_type_id'] = 1; - $returnProperties['provider_id'] = 1; - $returnProperties['current_employer'] = 1; - } - $extraProperties = self::defineExtraProperties($queryMode); $paymentFields = $extraProperties['paymentFields']; $extraReturnProperties = $extraProperties['extraReturnProperties']; -- 2.25.1