From d81c67a2285b51d5df6ce80a8fadaded3c87d7f6 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Wed, 28 May 2014 20:00:31 +1200 Subject: [PATCH] CRM-14197 remove rebase introduced error --- CRM/Member/BAO/Membership.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CRM/Member/BAO/Membership.php b/CRM/Member/BAO/Membership.php index 8d9d430291..dc08ed374a 100644 --- a/CRM/Member/BAO/Membership.php +++ b/CRM/Member/BAO/Membership.php @@ -2302,7 +2302,7 @@ INNER JOIN civicrm_contact contact ON ( contact.id = membership.contact_id AND public static function renewMembership($contactID, $membershipTypeID, $is_test, $changeToday, $modifiedID, $customFieldsFormatted, $numRenewTerms, $membershipID, $pending, $allStatus, $membershipTypeDetails, $contributionRecurID, $format, $membershipSource, $ids, $statusFormat, $isPayLater, $campaignId) { $renewalMode = $updateStatusId = FALSE; $dates = array(); -/ // CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType + // CRM-7297 - allow membership type to be be changed during renewal so long as the parent org of new membershipType // is the same as the parent org of an existing membership of the contact $currentMembership = CRM_Member_BAO_Membership::getContactMembership($contactID, $membershipTypeID, $is_test, $membershipID, TRUE -- 2.25.1