From a0713e701b43e5ac6eb5995e3b31778b2446d7cd Mon Sep 17 00:00:00 2001 From: monishdeb Date: Wed, 18 Dec 2013 12:02:30 +0530 Subject: [PATCH] CRM-13937 fix - Lifetime memberships created with a start date older than 3 months ago have a status of expired. http://issues.civicrm.org/jira/browse/CRM-13937 --- CRM/Member/BAO/MembershipStatus.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/CRM/Member/BAO/MembershipStatus.php b/CRM/Member/BAO/MembershipStatus.php index ec1eaeda45..6ade1ca1de 100644 --- a/CRM/Member/BAO/MembershipStatus.php +++ b/CRM/Member/BAO/MembershipStatus.php @@ -236,21 +236,22 @@ class CRM_Member_BAO_MembershipStatus extends CRM_Member_DAO_MembershipStatus { $statusDate = CRM_Utils_Date::customFormat($statusDate, '%Y%m%d'); } - $startDate = CRM_Utils_Date::customFormat($startDate, '%Y%m%d'); - $endDate = CRM_Utils_Date::customFormat($endDate, '%Y%m%d'); - $joinDate = CRM_Utils_Date::customFormat($joinDate, '%Y%m%d'); - $dates = array('start', 'end', 'join'); $events = array('start', 'end'); foreach ($dates as $dat) { - if (${$dat . 'Date'}) { + if (${$dat . 'Date'} && ${$dat . 'Date'} != "null") { + ${$dat . 'Date'} = CRM_Utils_Date::customFormat(${$dat . 'Date'}, '%Y%m%d'); + ${$dat . 'Year'} = substr(${$dat . 'Date'}, 0, 4); ${$dat . 'Month'} = substr(${$dat . 'Date'}, 4, 2); ${$dat . 'Day'} = substr(${$dat . 'Date'}, 6, 2); } + else { + ${$dat . 'Date'} = ''; + } } //fix for CRM-3570, if we have statuses with is_admin=1, -- 2.25.1