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

Always return an array with pending alarms

Browse source
This commit is contained in:
Thomas Bruederli 2012-08-04 16:48:31 +02:00
parent 7b66076705
commit 0c74b531c2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/calendar/calendar.php
View file

@ -840,7 +840,7 @@ class calendar extends rcube_plugin
{ {
$timestamp = time(); $timestamp = time();
$this->load_driver(); $this->load_driver();
$alarms = $this->driver->pending_alarms($timestamp); $alarms = (array)$this->driver->pending_alarms($timestamp);
foreach ($alarms as $i => $alarm) { foreach ($alarms as $i => $alarm) {
$alarms[$i]['id'] = 'cal:' . $alarm['id']; // prefix ID with cal: $alarms[$i]['id'] = 'cal:' . $alarm['id']; // prefix ID with cal:
} }

2
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -664,7 +664,7 @@ class kolab_driver extends calendar_driver
// only check for alerts once in 5 minutes // only check for alerts once in 5 minutes
if ($last == $slot) if ($last == $slot)
return false; return array();
if ($calendars && is_string($calendars)) if ($calendars && is_string($calendars))
$calendars = explode(',', $calendars); $calendars = explode(',', $calendars);