From 69f13416f6bd84173869b9185d3f4d0c0d84a2f5 Mon Sep 17 00:00:00 2001
From: Tobias Lounsbury <tobiaslounsbury@gmail.com>
Date: Thu, 10 Mar 2016 17:22:47 -0800
Subject: [PATCH] CRM-18211: Added check to verify existence of Contribution
 before calling completeTransaction

---
 CRM/Contribute/Form/Contribution/Confirm.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 40119a9469..92a69ff8de 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1577,7 +1577,10 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
       // Do not send an email if Recurring transaction is done via Direct Mode
       // Email will we sent when the IPN is received.
       foreach ($paymentResults as $result) {
-        $this->completeTransaction($result['result'], $result['contribution_id']);
+	      //CRM-18211: Fix situation where second contribution doesn't exist because it is optional.
+	      if($result['contribution_id']) {
+	        $this->completeTransaction($result['result'], $result['contribution_id']);
+	      }
       }
       return;
     }
-- 
2.25.1