From dc0b4bd39ac380f9ba11c79f16a2fb1ca0c22739 Mon Sep 17 00:00:00 2001 From: Aleksander Machniak Date: Wed, 5 Aug 2015 06:12:10 -0400 Subject: [PATCH] Fix bug where alarms set on event start time were displayed on event end time (T653) --- plugins/libcalendaring/libcalendaring.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/plugins/libcalendaring/libcalendaring.php b/plugins/libcalendaring/libcalendaring.php index f3b7cd6c..4246fa7f 100644 --- a/plugins/libcalendaring/libcalendaring.php +++ b/plugins/libcalendaring/libcalendaring.php @@ -613,7 +613,8 @@ class libcalendaring extends rcube_plugin $notify_time = $alarm['trigger']; } else if (is_string($alarm['trigger'])) { - $refdate = $alarm['trigger'][0] == '+' ? $rec['end'] : $rec['start']; +// $refdate = $alarm['trigger'][0] == '+' ? $rec['end'] : $rec['start']; + $refdate = $rec['start']; // abort if no reference date is available to compute notification time if (!is_a($refdate, 'DateTime')) @@ -634,8 +635,8 @@ class libcalendaring extends rcube_plugin } if ($notify_time && (!$notify_at || ($notify_time > $notify_at && $notify_time > $expires))) { - $notify_at = $notify_time; - $action = $alarm['action']; + $notify_at = $notify_time; + $action = $alarm['action']; $alarm_prop = $alarm; // generate a unique alarm ID if multiple alarms are set