upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-18 18:28:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #55623 from nextcloud/fix/caldav/principal-encoding-inconsistencies

Browse source
This commit is contained in:
Kate 2025-10-08 12:56:12 +02:00 committed by GitHub
commit 6c362cb38d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/dav/lib/Search/EventsSearchProvider.php
View file

@ -199,7 +199,7 @@ class EventsSearchProvider extends ACalendarSearchProvider implements IFiltering
[,, $principalId] = explode('/', $principalUri, 3);
return $this->urlGenerator->linkTo('', 'remote.php') . '/dav/calendars/'
. rawurlencode($principalId) . '/'
. str_replace(' ', '%20', $principalId) . '/'
. $calendarUri . '/'
. $calendarObjectUri;
}

1
apps/dav/tests/unit/Search/EventsSearchProviderTest.php
View file

@ -404,6 +404,7 @@ class EventsSearchProviderTest extends TestCase {
return [
['principals/users/john.doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obi5kb2UvZm9vL2Jhci5pY3M='],
['principals/users/John Doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvSm9obiUyMERvZS9mb28vYmFyLmljcw=='],
['principals/users/john@doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obkBkb2UvZm9vL2Jhci5pY3M='],
];
}