Merge pull request #13825 from mlutfy/dev801-5-12

[civicrm-core.git] / CRM / Contribute / Form / Task / PDFLetterCommon.php

diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index f5fdb968c9a63490de6607418340fd1d21ef3aed..044d7df56f9ac09a41aab86ba5cd92dcd8bceea6 100644 (file)
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -39,6 +39,9 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
         'subject' => CRM_Utils_Array::value('subject', $formValues),
         'from' => CRM_Utils_Array::value('from_email_address', $formValues),
       );
+
+      $emailParams['from'] = CRM_Utils_Mail::formatFromAddress($emailParams['from']);
+
       // We need display_name for emailLetter() so add to returnProperties here
       $returnProperties['display_name'] = 1;
       if (stristr($formValues['email_options'], 'pdfemail')) {
@@ -156,7 +159,7 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
     }
     if (!empty($html)) {
       // ie. we have only sent emails - lets no show a white screen
-      CRM_Utils_System::civiExit(1);
+      CRM_Utils_System::civiExit();
     }
   }