From ca76de352bff3d108164996eba535d481a48468e Mon Sep 17 00:00:00 2001
From: eileen <emcnaughton@wikimedia.org>
Date: Sun, 14 Jul 2019 20:54:31 +1200
Subject: [PATCH] [REF] [Export] remove another confusing parameter

---
 CRM/Export/BAO/ExportProcessor.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/CRM/Export/BAO/ExportProcessor.php b/CRM/Export/BAO/ExportProcessor.php
index 9dce29080a..e1b87117d2 100644
--- a/CRM/Export/BAO/ExportProcessor.php
+++ b/CRM/Export/BAO/ExportProcessor.php
@@ -1962,7 +1962,7 @@ class CRM_Export_BAO_ExportProcessor {
         elseif ($copyPostalGreeting) {
           $this->trimNonTokensFromAddressString($copyPostalGreeting,
             $postalOptions[$dao->copy_postal_greeting_id],
-            $exportParams
+            $this->getPostalGreetingTemplate()
           );
           $merge[$masterID]['postalGreeting'] = "{$merge[$masterID]['postalGreeting']}, {$copyPostalGreeting}";
           // if there happens to be a duplicate, remove it
@@ -1978,7 +1978,7 @@ class CRM_Export_BAO_ExportProcessor {
         elseif ($copyAddressee) {
           $this->trimNonTokensFromAddressString($copyAddressee,
             $addresseeOptions[$dao->copy_addressee_id],
-            $exportParams, 'addressee'
+            $this->getAddresseeGreetingTemplate()
           );
           $merge[$masterID]['addressee'] = "{$merge[$masterID]['addressee']}, " . trim($copyAddressee);
         }
@@ -2133,18 +2133,14 @@ WHERE  id IN ( $deleteIDString )
    *
    * @param string $parsedString
    * @param string $defaultGreeting
-   * @param bool $addressMergeGreetings
-   * @param string $greetingType
+   * @param string $greetingLabel
    *
    * @return mixed
    */
   public function trimNonTokensFromAddressString(
     &$parsedString, $defaultGreeting,
-    $addressMergeGreetings, $greetingType = 'postal_greeting'
+    $greetingLabel
   ) {
-    if (!empty($addressMergeGreetings[$greetingType])) {
-      $greetingLabel = $addressMergeGreetings[$greetingType];
-    }
     $greetingLabel = empty($greetingLabel) ? $defaultGreeting : $greetingLabel;
 
     $stringsToBeReplaced = preg_replace('/(\{[a-zA-Z._ ]+\})/', ';;', $greetingLabel);
-- 
2.25.1