diff options
| author | Daniel Kesselberg <mail@danielkesselberg.de> | 2023-09-06 17:48:21 +0200 |
|---|---|---|
| committer | backportbot-nextcloud[bot] <backportbot-nextcloud[bot]@users.noreply.github.com> | 2023-09-13 19:34:03 +0000 |
| commit | 0da5cb3b85eeb80c1dc9c043198cb424e25f560c (patch) | |
| tree | a4c36fa616a68c3d4c6b68cde6d92cdee91b1e17 /apps/dav | |
| parent | 0e5bb30929d74e88da06b7c55c26c25894913e18 (diff) | |
| download | nextcloud-server-0da5cb3b85eeb80c1dc9c043198cb424e25f560c.tar.gz nextcloud-server-0da5cb3b85eeb80c1dc9c043198cb424e25f560c.zip | |
fix(caldav): add webroot to objectid for activities
A calendar uri includes the webroot: example.com/cloud/remote.php/dav/calendars/alice/personal/
The calendar app uses base64(calendar uri) as identifier for calendar objects.
Without this patch the links from activity app to calendar app don't work for installations in a subdirectory.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Event.php | 2 | ||||
| -rw-r--r-- | apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php index 9ae04aadbba..13f0036b0b0 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php @@ -97,7 +97,7 @@ class Event extends Base { // The calendar app needs to be manually loaded for the routes to be loaded OC_App::loadApp('calendar'); $linkData = $eventData['link']; - $objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']); + $objectId = base64_encode($this->url->getWebroot() . '/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']); $link = [ 'view' => 'dayGridMonth', 'timeRange' => 'now', diff --git a/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php index 583ac6ca725..253e1628229 100644 --- a/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php +++ b/apps/dav/tests/unit/CalDAV/Activity/Provider/EventTest.php @@ -122,6 +122,8 @@ class EventTest extends TestCase { ->willReturn($calendarAppEnabled); if ($calendarAppEnabled) { $this->url->expects($this->once()) + ->method('getWebroot'); + $this->url->expects($this->once()) ->method('linkToRouteAbsolute') ->with('calendar.view.indexview.timerange.edit', $generatedLink) ->willReturn('fullLink'); |