From 54e5f5b8cb9251c59b03a663089dfffb75599194 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Fri, 27 Jul 2018 13:06:46 -0400 Subject: [PATCH] Changed date range returned for an event in an event list. This was showing the date range selected for the list of evnets rather than the date reange for the specific event. Now showing the correct date range for the entire event. --- models/front/events/baseAction.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php index f284c6b..f07795a 100644 --- a/models/front/events/baseAction.php +++ b/models/front/events/baseAction.php @@ -365,12 +365,12 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents $firstKey = key( $event['times'] ); reset( $event['times'] ); } - $event['dates'] = $this->getEventDate( - strtotime( $event['starting_date'] ), - strtotime( $event['ending_date'] ), - 'timestamp' - ); - $event['recurDays'] = $this->getEventRecurDays( $event ); + + // Get human-readable date range for this event. + // This replaced code that was using the date range selected rather than the date range for the entire event - now doing entire event. + $d = $this->getFirstAndLastTimes($event['id']); + $event['dates'] = $this->getEventDate( strtotime($d['first']), strtotime($d['last']), 'timestamp'); + } } $this->postAddTimes = false; -- 2.17.1