From: Monish Deb <monish.deb@webaccessglobal.com>
Date: Wed, 13 Apr 2016 11:05:16 +0000 (+0530)
Subject: Merge pull request #8119 from eileenmcnaughton/CRM-18303
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=a91cec11302c355761e565df00836fec56cf7ccb;p=civicrm-core.git

Merge pull request #8119 from eileenmcnaughton/CRM-18303

CRM-18303 call sendConfirmation api from completeOrder to cause reload
---

a91cec11302c355761e565df00836fec56cf7ccb
diff --cc CRM/Contribute/BAO/Contribution.php
index 14dd595f45,ee66e967b1..6eaca457d1
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@@ -4394,12 -4393,9 +4394,9 @@@ WHERE eft.financial_trxn_id IN ({$trxnI
          $values['amount'] = $recurContrib->amount;
          $values['financial_type_id'] = $objects['contributionType']->id;
          $values['title'] = $source = ts('Offline Recurring Contribution');
-         $domainValues = CRM_Core_BAO_Domain::getNameAndEmail();
-         $values['receipt_from_name'] = $domainValues[0];
-         $values['receipt_from_email'] = $domainValues[1];
        }
  
 -      if ($recurContrib && $recurContrib->id && !isset($input['is_email_receipt'])) {
 +      if ($recurContrib && $recurringContributionID && !isset($input['is_email_receipt'])) {
          //CRM-13273 - is_email_receipt setting on recurring contribution should take precedence over contribution page setting
          // but CRM-16124 if $input['is_email_receipt'] is set then that should not be overridden.
          $values['is_email_receipt'] = $recurContrib->is_email_receipt;