1.1 --- a/imipweb/event.py Thu Sep 03 19:00:50 2015 +0200
1.2 +++ b/imipweb/event.py Thu Sep 03 19:07:13 2015 +0200
1.3 @@ -677,7 +677,7 @@
1.4 recurrenceid = obj.get_recurrenceid()
1.5
1.6 if recurrenceid:
1.7 - parent = self.get_stored_object(uid)
1.8 + parent = self.get_stored_object(uid, None)
1.9 if not parent:
1.10 return
1.11
1.12 @@ -828,9 +828,10 @@
1.13
1.14 participant_attr = attendee_map.get(participant)
1.15 partstat = participant_attr and participant_attr.get("PARTSTAT")
1.16 + recurrences = obj.get_recurrence_start_points(recurrenceids, tzid)
1.17
1.18 for p in have_conflict(freebusy, periods, True):
1.19 - if not recurrenceid and p.is_replaced(recurrenceids):
1.20 + if not recurrenceid and p.is_replaced(recurrences):
1.21 continue
1.22
1.23 if ( # Unidentified or different event