Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix(caldav): encoding inconsistencies in event search provider
Signed-off-by: Richard Steinmetz <[email protected]>
  • Loading branch information
st3iny authored and backportbot[bot] committed Oct 8, 2025
commit 24d2b9575a0674d1a3f53aeee2bc2e5244ddc453
2 changes: 1 addition & 1 deletion apps/dav/lib/Search/EventsSearchProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ protected function getDavUrlForCalendarObject(
[,, $principalId] = explode('/', $principalUri, 3);

return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
. rawurlencode($principalId) . '/'
. str_replace(' ', '%20', $principalId) . '/'
. $calendarUri . '/'
. $calendarObjectUri;
}
Expand Down
1 change: 1 addition & 0 deletions apps/dav/tests/unit/Search/EventsSearchProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ public static function provideDeepLinkData(): array {
return [
['principals/users/john.doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obi5kb2UvZm9vL2Jhci5pY3M='],
['principals/users/John Doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvSm9obiUyMERvZS9mb28vYmFyLmljcw=='],
['principals/users/john@doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obkBkb2UvZm9vL2Jhci5pY3M='],
];
}

Expand Down
Loading