diff --git a/ChangeLog b/ChangeLog index 75dffb6a1..28224491f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-02-23 Francis Lachapelle + + * SoObjects/Appointments/SOGoCalendarComponent.m + (-newOccurenceWithID): set the occurrence timezone to the user's + timezone. This fixes an issue when accessing occurrences of a + recurrent event. + 2011-02-22 Francis Lachapelle * UI/Scheduler/UIxCalListingActions.m ( diff --git a/SoObjects/Appointments/SOGoCalendarComponent.m b/SoObjects/Appointments/SOGoCalendarComponent.m index 3ad472641..71df4b7a3 100644 --- a/SoObjects/Appointments/SOGoCalendarComponent.m +++ b/SoObjects/Appointments/SOGoCalendarComponent.m @@ -1,8 +1,9 @@ /* SOGoCalendarComponent.m - this file is part of SOGo * - * Copyright (C) 2006-2010 Inverse inc. + * Copyright (C) 2006-2011 Inverse inc. * * Author: Wolfgang Sourdeau + * Francis Lachapelle * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -311,10 +312,13 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence, iCalRepeatableEntityObject *masterOccurence, *newOccurence; iCalCalendar *calendar; NSCalendarDate *recDate; + NSTimeZone *timeZone; recDate = [NSCalendarDate dateWithTimeIntervalSince1970: [recID intValue]]; masterOccurence = [self component: NO secure: NO]; - + timeZone = [[[context activeUser] userDefaults] timeZone]; + [recDate setTimeZone: timeZone]; + if ([masterOccurence doesOccurOnDate: recDate]) { newOccurence = [masterOccurence mutableCopy];