Merge branch 4.6 into master

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

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index f9d1ad0e7609ebad32c6d5d78aff357740c29cea..454b4c33d0458a3437cd8417a821d76ed7c0b9ba 100644 (file)
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -470,6 +470,10 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
       if (empty($contactID)) {
         $contactID = $session->get('transaction.userID');
       }
+      // Fix Invoice email doesnot send out when completed payment using Paypal
+      if (empty($contactID)) {
+        $contactID = current($contactIds);
+      }
       $contactEmails = CRM_Core_BAO_Email::allEmails($contactID);
       $emails = array();
       $fromDisplayName = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact',
@@ -630,6 +634,8 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
    * @param string $html
    *   Content for pdf in html format.
    *
+   * @param string $name
+   *
    * @return string
    *   Name of file which is in pdf format
    */