CRM-16319 - CiviEvent Registration Invoice Fatal Error

https://issues.civicrm.org/jira/browse/CRM-16319

diff --git a/CRM/Contribute/Form/Task/Invoice.php b/CRM/Contribute/Form/Task/Invoice.php
index 97ebb604a6303f361a808c2481969ad09f0979cf..a7cbd4ad033e3f13cb1322dbe971a89ff8f18fb7 100644 (file)
--- a/CRM/Contribute/Form/Task/Invoice.php
+++ b/CRM/Contribute/Form/Task/Invoice.php
@@ -464,7 +464,9 @@ class CRM_Contribute_Form_Task_Invoice extends CRM_Contribute_Form_Task {
         'PDFFilename' => 'Invoice.pdf',
       );
       $session = CRM_Core_Session::singleton();
-      $contactID = $session->get('userID');
+      //CRM-16319 - we dont store in userID in case the user is doing multiple
+      //transactions etc
+      $contactID = empty($session->get('userID')) ? $session->get('transaction.userID') : $session->get('userID');
       $contactEmails = CRM_Core_BAO_Email::allEmails($contactID);
       $emails = array();
       $fromDisplayName = CRM_Core_DAO::getFieldValue('CRM_Contact_DAO_Contact',