From e5d7bfb17b4707687b7f0edad8562e1fc3920d3b Mon Sep 17 00:00:00 2001 From: Steve Sutton Date: Fri, 8 Apr 2016 15:12:39 -0400 Subject: [PATCH] fix issue with all_dates --- models/admin/management/events.php | 2 +- models/front/events/baseAction.php | 1 - models/front/events/list.php | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/models/admin/management/events.php b/models/admin/management/events.php index c94c60f..890580e 100644 --- a/models/admin/management/events.php +++ b/models/admin/management/events.php @@ -806,7 +806,7 @@ class GlmMembersAdmin_management_events extends GlmDataEventsManagement 'from_date' => $event['bdate'], 'to_date' => $event['edate'], 'all_day' => $allDay, - 'all_dates' => $allDates, + 'recurring' => $allDates, 'month_of_year' => $monthOfYear, 'week_of_month' => $weekOfMonth, 'day_of_week' => $dayOfWeek, diff --git a/models/front/events/baseAction.php b/models/front/events/baseAction.php index 110b426..21304c9 100644 --- a/models/front/events/baseAction.php +++ b/models/front/events/baseAction.php @@ -111,7 +111,6 @@ abstract class GlmMembersFront_events_baseAction extends GlmDataEvents if ($event['times']) { reset($event['times']); $firstKey = key($event['times']); - $event['ongoing'] = $event['times'][$firstKey]['ongoing']; reset($event['times']); } $event['dates'] = $this->getEventDate( diff --git a/models/front/events/list.php b/models/front/events/list.php index 0cc7916..06cae2a 100644 --- a/models/front/events/list.php +++ b/models/front/events/list.php @@ -248,7 +248,7 @@ class GlmMembersFront_events_list extends GlmMembersFront_events_baseAction // dates $dates = new SetaPDF_Core_Text_Block( $boldFont, self::PDF_FONT_SIZE ); $eventDates = $event['dates']; - if ( !$event['ongoing'] && count( $event['times'] > 1) && isset( $event['recurrences'] ) ) { + if ( $event['recurring'] && count( $event['times'] > 1) && isset( $event['recurrences'] ) ) { if ( $event['recurrences'][0]['day_of_week']['names'] ) { $eventDates .= ' (' . implode(', ', $event['recurrences'][0]['day_of_week']['names']) . ')'; } -- 2.17.1