Branch 'roundcubemail-plugins-kolab-3.1' - 2 commits - plugins/libkolab
Thomas Brüderli
bruederli at kolabsys.com
Wed Jan 15 16:38:15 CET 2014
plugins/libkolab/lib/kolab_date_recurrence.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 62533e9241ae4d4a5add28695a36793ac13cd8b1
Merge: 98db2ce a01a3ea
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Jan 15 16:38:02 2014 +0100
Merge branch 'roundcubemail-plugins-kolab-3.1' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab into roundcubemail-plugins-kolab-3.1
commit 98db2cef61d0260746f5ba463037aeff970161a1
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date: Wed Jan 15 16:32:34 2014 +0100
Avoid fatal errors in case the event object has invalid date properties
diff --git a/plugins/libkolab/lib/kolab_date_recurrence.php b/plugins/libkolab/lib/kolab_date_recurrence.php
index 85ffd91..1dc63be 100644
--- a/plugins/libkolab/lib/kolab_date_recurrence.php
+++ b/plugins/libkolab/lib/kolab_date_recurrence.php
@@ -118,7 +118,7 @@ class kolab_date_recurrence
}
// determine a reasonable end date if none given
- if (!$event['recurrence']['COUNT']) {
+ if (!$event['recurrence']['COUNT'] && $event['start'] instanceof DateTime) {
switch ($event['recurrence']['FREQ']) {
case 'YEARLY': $intvl = 'P100Y'; break;
case 'MONTHLY': $intvl = 'P20Y'; break;
More information about the commits
mailing list