diff --git a/NEWS b/NEWS index b4a96d63e..fe33f5c48 100644 --- a/NEWS +++ b/NEWS @@ -38,6 +38,7 @@ Bug fixes - [web] handle semicolon in values during LDIF import (#1760) - [web] fixed computation of week number (#3973, #3976) - [web] fixed saving of inactive calendars (#3862, #3980) + - [web] fixed public URLs to Calendars (#3974) - [eas] properly skip folders we don't want to synchronize (#3943) - [eas] fixed 30 mins freebusy offset with S Planner - [eas] now correctly handles reminders on tasks (#3964) diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m index 95f5a12be..0e7b83386 100644 --- a/SoObjects/SOGo/SOGoGCSFolder.m +++ b/SoObjects/SOGo/SOGoGCSFolder.m @@ -475,9 +475,8 @@ static NSArray *childRecordFields = nil; davURL = [self realDavURL]; newPath = [NSMutableArray arrayWithArray: [[davURL path] componentsSeparatedByString: @"/"]]; [newPath insertObject: @"public" atIndex: 3]; - davURL = [[NSURL alloc] initWithScheme: [davURL scheme] - host: [davURL host] - path: [newPath componentsJoinedByString: @"/"]]; + davURL = [NSURL URLWithString: [newPath componentsJoinedByString: @"/"] + relativeToURL: davURL]; return davURL; } @@ -500,10 +499,7 @@ static NSArray *childRecordFields = nil; [container nameInContainer], [self realNameInContainer]]; currentDavURL = [self davURL]; - realDavURL = [[NSURL alloc] initWithScheme: [currentDavURL scheme] - host: [currentDavURL host] - path: path]; - [realDavURL autorelease]; + realDavURL = [NSURL URLWithString: path relativeToURL: currentDavURL]; } else realDavURL = [self davURL];