Merge pull request #14819 from eileenmcnaughton/export_up

[REF] [Export] Stop passing export params to the merge function
civicrm · Jul 14, 2019 · 46e6a0e · 46e6a0e
2 parents 5867d44 + 423e3da
commit 46e6a0e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
@@ -1851,11 +1851,10 @@ public function getGroupBy($query) {
 
   /**
    * @param int $contactId
-   * @param array $exportParams
    *
    * @return array
    */
-  public function replaceMergeTokens($contactId, $exportParams) {
+  public function replaceMergeTokens($contactId) {
     $greetings = [];
     $contact = NULL;
 
@@ -1864,7 +1863,8 @@ public function replaceMergeTokens($contactId, $exportParams) {
       'addressee' => $this->getAddresseeGreetingTemplate(),
     ];
     foreach ($greetingFields as $greeting => $greetingLabel) {
-      if (!empty($exportParams[$greeting])) {
+      $tokens = CRM_Utils_Token::getTokens($greetingLabel);
+      if (!empty($tokens)) {
         if (empty($contact)) {
           $values = [
             'id' => $contactId,
@@ -1911,7 +1911,7 @@ public function buildMasterCopyArray($sql, $exportParams, $sharedAddress = FALSE
 
       if (!$sharedAddress) {
         if (!isset($this->contactGreetingFields[$dao->master_contact_id])) {
-          $this->contactGreetingFields[$dao->master_contact_id] = $this->replaceMergeTokens($dao->master_contact_id, $exportParams);
+          $this->contactGreetingFields[$dao->master_contact_id] = $this->replaceMergeTokens($dao->master_contact_id);
         }
         $masterPostalGreeting = CRM_Utils_Array::value('postal_greeting',
           $this->contactGreetingFields[$dao->master_contact_id], $dao->master_postal_greeting
@@ -1921,7 +1921,7 @@ public function buildMasterCopyArray($sql, $exportParams, $sharedAddress = FALSE
         );
 
         if (!isset($contactGreetingTokens[$dao->copy_contact_id])) {
-          $this->contactGreetingFields[$dao->copy_contact_id] = $this->replaceMergeTokens($dao->copy_contact_id, $exportParams);
+          $this->contactGreetingFields[$dao->copy_contact_id] = $this->replaceMergeTokens($dao->copy_contact_id);
         }
         $copyPostalGreeting = CRM_Utils_Array::value('postal_greeting',
           $this->contactGreetingFields[$dao->copy_contact_id], $dao->copy_postal_greeting