Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix bug where alarms set on event start time were displayed on event end time (T653)

Browse source
This commit is contained in:
Aleksander Machniak 2015-08-05 06:12:10 -04:00
parent a9422ea11c
commit 957ebdf466
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
plugins/libcalendaring/libcalendaring.php
View file

@ -613,7 +613,8 @@ class libcalendaring extends rcube_plugin
$notify_time = $alarm['trigger']; $notify_time = $alarm['trigger'];
} }
else if (is_string($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 // abort if no reference date is available to compute notification time
if (!is_a($refdate, 'DateTime')) 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))) { if ($notify_time && (!$notify_at || ($notify_time > $notify_at && $notify_time > $expires))) {
$notify_at = $notify_time; $notify_at = $notify_time;
$action = $alarm['action']; $action = $alarm['action'];
$alarm_prop = $alarm; $alarm_prop = $alarm;
// generate a unique alarm ID if multiple alarms are set // generate a unique alarm ID if multiple alarms are set