CRM-17427 condition receipt sent status msg properly

diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php
index 25e097f88f8f6c486408926734d7ba16c6a8ecb2..60523e2544bab9a2ad7257770aaa8a4b7a2c1b45 100644 (file)
--- a/CRM/Member/Form/Membership.php
+++ b/CRM/Member/Form/Membership.php
@@ -1701,6 +1701,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
       }
     }
 
+    $receiptSent = false;
     if (!empty($formValues['send_receipt']) && $receiptSend) {
       $formValues['contact_id'] = $this->_contactID;
       $formValues['contribution_id'] = $contributionId;
@@ -1711,6 +1712,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
       // send email receipt
       $this->assignBillingName();
       $mailSend = self::emailReceipt($this, $formValues, $membership);
+      $receiptSent = true;
     }
 
     // finally set membership id if already not set
@@ -1719,7 +1721,7 @@ class CRM_Member_Form_Membership extends CRM_Member_Form {
     }
 
     $isRecur = CRM_Utils_Array::value('is_recur', $params);
-    $this->setStatusMessage($membership, $endDate, $receiptSend, $membershipTypes, $createdMemberships, $isRecur, $calcDates, $mailSend);
+    $this->setStatusMessage($membership, $endDate, $receiptSent, $membershipTypes, $createdMemberships, $isRecur, $calcDates, $mailSend);
     return $createdMemberships;
   }