From: deb.monish <monish.deb@webaccessglobal.com>
Date: Wed, 10 Aug 2016 09:12:24 +0000 (+0530)
Subject: CRM-19204: Contact-to-contact email attachments not working
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=cde0330567ddcb87cf89fa2711bee96fbd2e416d;p=civicrm-core.git

CRM-19204: Contact-to-contact email attachments not working
---

diff --git a/CRM/Core/BAO/File.php b/CRM/Core/BAO/File.php
index b6deb13ace..c2480ad9b8 100644
--- a/CRM/Core/BAO/File.php
+++ b/CRM/Core/BAO/File.php
@@ -556,6 +556,12 @@ AND       CEF.entity_id    = %2";
         );
 
         CRM_Utils_File::formatFile($formValues, $attachName, $extraParams);
+
+        // set the formatted attachment attributes to $params, later used by
+        // CRM_Activity_BAO_Activity::sendEmail(...) to send mail with desired attachments
+        if (!empty($formValues[$attachName])) {
+          $params[$attachName] = $formValues[$attachName];
+        }
       }
     }
   }