From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Tue, 30 Sep 2014 02:59:32 +0000 (+1300)
Subject: CRM-15296 enotice fix
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ef0abb4c396352163542fc1e279ba2143bb7cbf9;p=civicrm-core.git

CRM-15296 enotice fix
---

diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php
index 0d23c3bbd6..cea0c0ee62 100644
--- a/CRM/Contribute/Form/Contribution/Confirm.php
+++ b/CRM/Contribute/Form/Contribution/Confirm.php
@@ -1150,7 +1150,6 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr
    * @param array $lineItems
    *
    * @throws Exception
-   * @internal param bool $deductibleMode
    * @return CRM_Contribute_DAO_Contribution
    * @access public
    */
diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php
index 04417cdd42..5b5a38108c 100644
--- a/CRM/Member/BAO/Membership.php
+++ b/CRM/Member/BAO/Membership.php
@@ -2364,7 +2364,7 @@ INNER JOIN  civicrm_contact contact ON ( contact.id = membership.contact_id AND
             $format
           ),
           'membership_type_id' => $membershipTypeID,
-          'max_related' => $membershipTypeDetails['max_related'],
+          'max_related' => !empty($membershipTypeDetails['max_related']) ? $membershipTypeDetails['max_related'] : NULL,
         );
         $session = CRM_Core_Session::singleton();
         // If we have an authenticated session, set modified_id to that user's contact_id, else set to membership.contact_id