From: eileen <emcnaughton@wikimedia.org>
Date: Tue, 5 Jan 2016 01:12:55 +0000 (+1300)
Subject: CRM-17772 Export function tidy up: remove unused params
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=36f38fe7af076907be5e436fa160d0aab92fedd5;p=civicrm-core.git

CRM-17772 Export function tidy up: remove unused params
---

diff --git a/CRM/Export/BAO/Export.php b/CRM/Export/BAO/Export.php
index 5aeff00104..ac502166c7 100644
--- a/CRM/Export/BAO/Export.php
+++ b/CRM/Export/BAO/Export.php
@@ -303,8 +303,7 @@ class CRM_Export_BAO_Export {
   ) {
 
     $headerRows = $returnProperties = array();
-    $primary = $paymentFields = $selectedPaymentFields = FALSE;
-    $origFields = $fields;
+    $paymentFields = $selectedPaymentFields = FALSE;
     $relationField = NULL;
 
     $phoneTypes = CRM_Core_PseudoConstant::get('CRM_Core_DAO_Phone', 'phone_type_id');
@@ -453,9 +452,6 @@ class CRM_Export_BAO_Export {
         $returnProperties['current_employer'] = 1;
       }
 
-      $extraReturnProperties = array();
-      $paymentFields = FALSE;
-
       $extraProperties = self::defineExtraProperties($queryMode);
       $paymentFields = $extraProperties['paymentFields'];
       $extraReturnProperties = $extraProperties['extraReturnProperties'];
@@ -700,8 +696,6 @@ INSERT INTO {$componentTable} SELECT distinct gc.contact_id FROM civicrm_group_c
 
     $queryString = "$select $from $where $having";
 
-    $groupBy = "";
-
     $groupBy = self::getGroupBy($exportMode, $queryMode, $returnProperties, $query);
 
     $queryString .= $groupBy;