LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

See ChangeLog. 

Monotone-Parent: 6722e59df0723e9698a938cf20033b44e842756f
Monotone-Revision: 52bc1ab2a2dcc4de7809fd592d0e9c41c556cf17

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-08-22T13:49:45
maint-2.0.2
Francis Lachapelle 2012-08-22 13:49:45 +00:00
parent 4156dc77fc
commit 426696b033
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SOPE/NGCards/ChangeLog
View File

@ -1,3 +1,9 @@
2012-08-22 Francis Lachapelle <flachapelle@inverse.ca>
* iCalWeeklyRecurrenceCalculator.m
(-recurrenceRangesWithinCalendarDateRange:): fixed validation of
the interval when a day mask is used on multiple days.
2012-08-21 Francis Lachapelle <flachapelle@inverse.ca>
* iCalRepeatableEntityObject.m (-exceptionDatesWithTimeZone:): we

6
SOPE/NGCards/iCalWeeklyRecurrenceCalculator.m
View File

@ -118,8 +118,8 @@
currentStartDate = [firStart copy];
[currentStartDate autorelease];
ranges = [NSMutableArray array];
i = 0;
count = 0;
i = [currentStartDate dayOfWeek]; // Set the first day of the week as Sunday and ignore WKST
if (dayMask == nil)
{
@ -158,7 +158,7 @@
[startDate compare: currentStartDate] == NSOrderedSame)
{
// If the rule count is defined, stop once the count is reached.
if (i == 0)
if ([currentStartDate compare: firStart] == NSOrderedSame)
{
// Always add the start date of the recurring event if within
// the lookup range.
@ -166,8 +166,6 @@
}
else
{
// The following always set the first day of the week as the day
// of the master event start date, ie WKST is ignored.
week = i / 7;
if ((week % interval) == 0 &&