From 0c74b531c22ac9d7f44e068af9a66674746987fa Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Sat, 4 Aug 2012 16:48:31 +0200 Subject: [PATCH] Always return an array with pending alarms --- plugins/calendar/calendar.php | 2 +- plugins/calendar/drivers/kolab/kolab_driver.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php index e0c71263..722e1cb9 100644 --- a/plugins/calendar/calendar.php +++ b/plugins/calendar/calendar.php @@ -840,7 +840,7 @@ class calendar extends rcube_plugin { $timestamp = time(); $this->load_driver(); - $alarms = $this->driver->pending_alarms($timestamp); + $alarms = (array)$this->driver->pending_alarms($timestamp); foreach ($alarms as $i => $alarm) { $alarms[$i]['id'] = 'cal:' . $alarm['id']; // prefix ID with cal: } diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php index c3151e46..9346f820 100644 --- a/plugins/calendar/drivers/kolab/kolab_driver.php +++ b/plugins/calendar/drivers/kolab/kolab_driver.php @@ -664,7 +664,7 @@ class kolab_driver extends calendar_driver // only check for alerts once in 5 minutes if ($last == $slot) - return false; + return array(); if ($calendars && is_string($calendars)) $calendars = explode(',', $calendars);