Branch 'dev/libcalendaring' - plugins/calendar

[Thomas Brüderli]

 plugins/calendar/drivers/kolab/kolab_calendar.php |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 826f3f8ea39299a9c8e8cf105ec112ef32960c38
Author: Thomas Bruederli <bruederli at kolabsys.com>
Date:   Fri Nov 9 13:55:57 2012 +0100

    Avoid endless loops in recurrence computation

diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
index a62eb54..c1c8626 100644
--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
@@ -409,6 +409,10 @@ class kolab_calendar
       }
       else if ($next_event['start'] > $end)  // stop loop if out of range
         break;
+
+	  // avoid endless recursion loops
+	  if ($i > 1000)
+		  break;
     }
     
     return $events;