From 2cac48532a3442de6a267dfdcc5bd8a46b2a5bff Mon Sep 17 00:00:00 2001
From: Matthew Wire <devel@mrwire.co.uk>
Date: Sat, 2 Dec 2017 11:19:57 +0000
Subject: [PATCH] Only include email address on contribution pdf task. Make
 sure we pass through from_email_address when non-default selected

---
 CRM/Contact/Form/Task/PDFLetterCommon.php    |  2 --
 CRM/Contribute/Form/Task/PDFLetterCommon.php | 14 +++++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CRM/Contact/Form/Task/PDFLetterCommon.php b/CRM/Contact/Form/Task/PDFLetterCommon.php
index d1ef15e2d1..eb3b9ee6fc 100644
--- a/CRM/Contact/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contact/Form/Task/PDFLetterCommon.php
@@ -105,8 +105,6 @@ class CRM_Contact_Form_Task_PDFLetterCommon {
       FALSE
     );
 
-    $form->add('select', 'from_email_address', ts('From Email Address'), $form->_fromEmails, TRUE);
-
     $form->add('static', 'pdf_format_header', NULL, ts('Page Format: %1', array(1 => '<span class="pdf-format-header-label"></span>')));
     $form->addSelect('format_id', array(
       'label' => ts('Select Format'),
diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index ace2053964..7a3477fca0 100644
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -6,6 +6,17 @@
  */
 class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDFLetterCommon {
 
+  /**
+   * Build the form object.
+   *
+   * @var CRM_Core_Form $form
+   */
+  public static function buildQuickForm(&$form) {
+    // Contribute PDF tasks allow you to email as well, so we need to add email address to those forms
+    $form->add('select', 'from_email_address', ts('From Email Address'), $form->_fromEmails, TRUE);
+    parent::buildQuickForm($form);
+  }
+
   /**
    * Process the form after the input has been submitted and validated.
    *
@@ -22,7 +33,8 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
     if (!empty($formValues['email_options'])) {
       $returnProperties['email'] = $returnProperties['on_hold'] = $returnProperties['is_deceased'] = $returnProperties['do_not_email'] = 1;
       $emailParams = array(
-        'subject' => $formValues['subject'],
+        'subject' => CRM_Utils_Array::value('subject', $formValues),
+        'from' => CRM_Utils_Array::value('from_email_address', $formValues),
       );
       // We need display_name for emailLetter() so add to returnProperties here
       $returnProperties['display_name'] = 1;
-- 
2.25.1