From: Coleman Watts <coleman@civicrm.org>
Date: Wed, 14 Jan 2015 01:25:45 +0000 (-0500)
Subject: CRM-15817 - Fix merge error
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=aa8694283672ed6493cde75e91296db6ac47c178;p=civicrm-core.git

CRM-15817 - Fix merge error
---

diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php
index 3034ab939a..6aa92b45f1 100644
--- a/CRM/Core/Payment/BaseIPN.php
+++ b/CRM/Core/Payment/BaseIPN.php
@@ -596,7 +596,7 @@ LIMIT 1;";
     if ($contribution->id) {
       $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name');
       if ((empty($input['prevContribution']) && $paymentProcessorId) || (!$input['prevContribution']->is_pay_later &&
--      $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses))) {
+       $input['prevContribution']->contribution_status_id == array_search('Pending', $contributionStatuses))) {
        $input['payment_processor'] = $paymentProcessorId;
       }
       $input['contribution_status_id'] = array_search('Completed', $contributionStatuses);