From 3425da095256b064ce0689bc394f8d22f884f959 Mon Sep 17 00:00:00 2001
From: eileenmcnaugton <eileen@fuzion.co.nz>
Date: Wed, 5 Aug 2015 08:58:37 +1200
Subject: [PATCH] CRM-16523 towards fixing test on this

---
 CRM/Contribute/BAO/Contribution.php | 7 +++----
 CRM/Core/Payment/BaseIPN.php        | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index 6b6edcdb1f..14f7c9902f 100644
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4266,7 +4266,7 @@ LIMIT 1;";
     if (!array_key_exists('is_email_receipt', $values) ||
       $values['is_email_receipt'] == 1
     ) {
-      self::sendMail($input, $ids, $objects, $values, $recur, FALSE);
+      self::sendMail($input, $ids, $objects['contribution'], $values, $recur, FALSE);
       CRM_Core_Error::debug_log_message("Receipt sent");
     }
 
@@ -4289,7 +4289,7 @@ LIMIT 1;";
    *   Incoming data from Payment processor.
    * @param array $ids
    *   Related object IDs.
-   * @param $objects
+   * @param CRM_Contribute_BAO_Contribution $contribution
    * @param array $values
    *   Values related to objects that have already been loaded.
    * @param bool $recur
@@ -4300,8 +4300,7 @@ LIMIT 1;";
    *
    * @return array
    */
-  public static function sendMail(&$input, &$ids, &$objects, &$values, $recur = FALSE, $returnMessageText = FALSE) {
-    $contribution = $objects['contribution'];
+  public static function sendMail(&$input, &$ids, $contribution, &$values, $recur = FALSE, $returnMessageText = FALSE) {
     $input['is_recur'] = $recur;
     // set receipt from e-mail and name in value
     if (!$returnMessageText) {
diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index a31c1e232c..3d4ec6e8df 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -494,7 +494,8 @@ class CRM_Core_Payment_BaseIPN {
    * @return array
    */
   public function sendMail(&$input, &$ids, &$objects, &$values, $recur = FALSE, $returnMessageText = FALSE) {
-    return CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects, $values, $recur, $returnMessageText);
+    return CRM_Contribute_BAO_Contribution::sendMail($input, $ids, $objects['contribution'], $values, $recur,
+      $returnMessageText);
   }
 
 }
-- 
2.25.1