From e9ac29eb8b08cc74495966b10fdc8bfb7ec4cd42 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Thu, 29 Jan 2015 13:36:53 +1300 Subject: [PATCH] fix mixup of variable name during rebasing --- CRM/Member/BAO/MembershipType.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRM/Member/BAO/MembershipType.php b/CRM/Member/BAO/MembershipType.php index 088144bb8b..30e872327f 100644 --- a/CRM/Member/BAO/MembershipType.php +++ b/CRM/Member/BAO/MembershipType.php @@ -444,10 +444,10 @@ class CRM_Member_BAO_MembershipType extends CRM_Member_DAO_MembershipType { * @param string $startDate start date of current membership period * @param array $membershipTypeDetails * @param int $year - * @param $fixedStartDate + * @param string $actualStartDate * @return bool is this in the window where the membership gets an extra part-period added */ - protected static function isDuringFixedAnnualRolloverPeriod($startDate, $membershipTypeDetails, $year, $fixedStartDate) { + protected static function isDuringFixedAnnualRolloverPeriod($startDate, $membershipTypeDetails, $year, $actualStartDate) { $rolloverMonth = substr($membershipTypeDetails['fixed_period_rollover_day'], 0, strlen($membershipTypeDetails['fixed_period_rollover_day']) - 2 -- 2.25.1