From: monishdeb <monish.deb@webaccessglobal.com>
Date: Wed, 13 Jan 2016 19:25:58 +0000 (+0530)
Subject: minor fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2b65b5152871092ab09af5adbcdaf1b867ae6fa0;p=civicrm-core.git

minor fix
---

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 70fedbddd9..0091e4ceeb 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -2445,7 +2445,9 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
         $values['is_email_receipt'] = 1;
       }
 
-      $values['contributionId'] = $ids['contribution'];
+      if (!empty($ids['contribution'])) {
+        $values['contributionId'] = $ids['contribution'];
+      }
 
       return CRM_Event_BAO_Event::sendMail($ids['contact'], $values,
         $this->_relatedObjects['participant']->id, $this->is_test, $returnMessageText
@@ -2732,9 +2734,6 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac
       $values['useForMember'] = TRUE;
     }
 
-    $template->assign('contributionId', $this->id);
-    $values['contributionId'] = $this->id;
-
     //assign honor information to receipt message
     $softRecord = CRM_Contribute_BAO_ContributionSoft::getSoftContribution($this->id);