1.1 --- a/imipweb/event.py Tue Apr 07 00:36:47 2015 +0200
1.2 +++ b/imipweb/event.py Tue Apr 07 00:38:22 2015 +0200
1.3 @@ -808,7 +808,7 @@
1.4 # Show any conflicts with periods of actual attendance.
1.5
1.6 for p in have_conflict(freebusy, periods, True):
1.7 - if (p.uid != uid or p.recurrenceid != recurrenceid) and p.transp != "ORG":
1.8 + if (p.uid != uid or (recurrenceid and p.recurrenceid) and p.recurrenceid != recurrenceid) and p.transp != "ORG":
1.9 conflicts.append(p)
1.10
1.11 conflicts.sort()