Add handling of BYSETPOS for BYDAY in repeat rule
parent
6f732ba535
commit
d293fe79ed
3
NEWS
3
NEWS
|
@ -1,6 +1,9 @@
|
||||||
3.2.4 (2016-12-DD)
|
3.2.4 (2016-12-DD)
|
||||||
------------------
|
------------------
|
||||||
|
|
||||||
|
Enhancements
|
||||||
|
- [core] added handling of BYSETPOS for BYDAY in recurrence rules
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- [web] fixed JavaScript exception when SOGo is launched from an external link (#3900)
|
- [web] fixed JavaScript exception when SOGo is launched from an external link (#3900)
|
||||||
- [web] restored fetching of freebusy information of MS Exchange contacts
|
- [web] restored fetching of freebusy information of MS Exchange contacts
|
||||||
|
|
|
@ -466,9 +466,16 @@ NSString *iCalWeekDayString[] = { @"SU", @"MO", @"TU", @"WE", @"TH", @"FR",
|
||||||
|
|
||||||
- (iCalByDayMask *) byDayMask
|
- (iCalByDayMask *) byDayMask
|
||||||
{
|
{
|
||||||
|
NSArray *setPos;
|
||||||
|
NSString *day;
|
||||||
|
|
||||||
if (dayMask == nil && [[self byDay] length])
|
if (dayMask == nil && [[self byDay] length])
|
||||||
{
|
{
|
||||||
dayMask = [iCalByDayMask byDayMaskWithRuleString: [self byDay]];
|
day = [self byDay];
|
||||||
|
setPos = [self bySetPos];
|
||||||
|
if ([setPos count])
|
||||||
|
day = [NSString stringWithFormat: @"%@%@", [setPos lastObject], day];
|
||||||
|
dayMask = [iCalByDayMask byDayMaskWithRuleString: day];
|
||||||
[dayMask retain];
|
[dayMask retain];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue