From: eileen Date: Thu, 22 Aug 2013 05:40:04 +0000 (+1200) Subject: CRM-13273 - is_email_receipt setting on recurring contribution should get precedence X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=2b5b02794d5bed7eeccbbd33dbe5fd1b9741c0fd;p=civicrm-core.git CRM-13273 - is_email_receipt setting on recurring contribution should get precedence --- diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index 80ffac77f6..942822432b 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -326,11 +326,14 @@ class CRM_Core_Payment_BaseIPN { $values['amount'] = $recurContrib->amount; $values['financial_type_id'] = $objects['contributionType']->id; $values['title'] = $source = ts('Offline Recurring Contribution'); - $values['is_email_receipt'] = $recurContrib->is_email_receipt; $domainValues = CRM_Core_BAO_Domain::getNameAndEmail(); $values['receipt_from_name'] = $domainValues[0]; $values['receipt_from_email'] = $domainValues[1]; } + if($recurContrib->id){ + //CRM-13273 - is_email_receipt setting on recurring contribution should take precedence over contribution page setting + $values['is_email_receipt'] = $recurContrib->is_email_receipt; + } $contribution->source = $source; if (CRM_Utils_Array::value('is_email_receipt', $values)) {