Fix public URLs to Calendars

Fixes #3974
Alinto · Jan 6, 2017 · 327ebf0 · 327ebf0
1 parent abb1e1b
commit 327ebf0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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
@@ -475,9 +475,8 @@ - (NSURL *) publicDavURL
   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 @@ - (NSURL *) realDavURL
                        [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];