From 6464934cd6be77827e89dce62f62a3059b15cc92 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 15 Nov 2016 10:17:28 -0800 Subject: [PATCH] Fix a bug on Calendar event day views for all day events in certain timezones Summary: Ref T11816. This logic was correct, we just did all the work and then mostly threw away the results. This worked correctly anyway in some timezones. Instead, actually use `$min_date` and `$max_date`. Test Plan: In "America/Toronto" with server in a more-western timezone, viewed a "Nov 11 - Nov 12" all-day event, saw those dates. Reviewers: chad Reviewed By: chad Maniphest Tasks: T11816 Differential Revision: https://secure.phabricator.com/D16867 --- .../calendar/storage/PhabricatorCalendarEvent.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/applications/calendar/storage/PhabricatorCalendarEvent.php b/src/applications/calendar/storage/PhabricatorCalendarEvent.php index 6d76ad6816..6acd90b3f2 100644 --- a/src/applications/calendar/storage/PhabricatorCalendarEvent.php +++ b/src/applications/calendar/storage/PhabricatorCalendarEvent.php @@ -590,10 +590,10 @@ final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO $start = $this->newStartDateTime(); $end = $this->newEndDateTime(); - if ($show_end) { - $min_date = $start->newPHPDateTime(); - $max_date = $end->newPHPDateTime(); + $min_date = $start->newPHPDateTime(); + $max_date = $end->newPHPDateTime(); + if ($show_end) { // Subtract one second since the stored date is exclusive. $max_date = $max_date->modify('-1 second'); @@ -605,8 +605,8 @@ final class PhabricatorCalendarEvent extends PhabricatorCalendarDAO $show_end_date = false; } - $min_epoch = $start->getEpoch(); - $max_epoch = $end->getEpoch(); + $min_epoch = $min_date->format('U'); + $max_epoch = $max_date->format('U'); if ($this->getIsAllDay()) { if ($show_end_date) {