From d3ad3f0a3ade43ea0513ba95ebb91a6bb772a72c Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 16 Nov 2018 12:45:03 +1300
Subject: [PATCH] Don't pass il8n object, just use singleton

---
 CRM/Export/BAO/Export.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index fe8b523d9b..f912c0adf9 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -1627,7 +1627,6 @@ WHERE  {$whereClause}";
    * @param $field
    * @param $iterationDAO
    * @param $fieldValue
-   * @param $i18n
    * @param $metadata
    * @param $paymentDetails
    *
@@ -1635,8 +1634,9 @@ WHERE  {$whereClause}";
    *
    * @return string
    */
-  protected static function getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor) {
+  protected static function getTransformedFieldValue($field, $iterationDAO, $fieldValue, $metadata, $paymentDetails, $processor) {
 
+    $i18n = CRM_Core_I18n::singleton();
     if ($field == 'id') {
       return $iterationDAO->contact_id;
       // special case for calculated field
@@ -1747,7 +1747,6 @@ WHERE  {$whereClause}";
   protected static function buildRow($query, $iterationDAO, $processor, $outputColumns, $metadata, $paymentDetails, $addPaymentHeader, $paymentTableId) {
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
     $imProviders = CRM_Core_PseudoConstant::get('CRM_Core_DAO_IM', 'provider_id');
-    $i18n = CRM_Core_I18n::singleton();
 
     $row = [];
     $query->convertToPseudoNames($iterationDAO);
@@ -1798,7 +1797,7 @@ WHERE  {$whereClause}";
         }
       }
       else {
-        $row[$field] = self::getTransformedFieldValue($field, $iterationDAO, $fieldValue, $i18n, $metadata, $paymentDetails, $processor);
+        $row[$field] = self::getTransformedFieldValue($field, $iterationDAO, $fieldValue, $metadata, $paymentDetails, $processor);
       }
     }
 
-- 
2.25.1