From 8e13f3977f2d9aee0f674157bc2e67b0a7e9e614 Mon Sep 17 00:00:00 2001 From: nathangray Date: Thu, 11 May 2017 11:14:55 -0600 Subject: [PATCH] Calendar - Fix daily recurring recur end date got one day later when you save if timezone was Tahiti --- calendar/inc/class.calendar_bo.inc.php | 2 -- calendar/inc/class.calendar_boupdate.inc.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index d84347ce11..e3d12968d6 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -895,8 +895,6 @@ class calendar_bo } } if (!$start) $start = $event['start']; - $start_obj = new Api\DateTime($start); - $read_start = new Api\DateTime($event_read['start']); $events = array(); $this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events); diff --git a/calendar/inc/class.calendar_boupdate.inc.php b/calendar/inc/class.calendar_boupdate.inc.php index f3b6faed4d..9d02e0d7dc 100644 --- a/calendar/inc/class.calendar_boupdate.inc.php +++ b/calendar/inc/class.calendar_boupdate.inc.php @@ -1182,7 +1182,7 @@ class calendar_boupdate extends calendar_bo // set recur-enddate/range-end to real end-date of last recurrence if ($event['recur_type'] != MCAL_RECUR_NONE && $event['recur_enddate']) { - $rrule = calendar_rrule::event2rrule($event, false); + $rrule = calendar_rrule::event2rrule($event); $rrule->rewind(); $enddate = $rrule->current(); do