From 7bfa81216d592956e87a70d93147623d21f2be1d Mon Sep 17 00:00:00 2001 From: Richard Steinmetz Date: Wed, 8 Oct 2025 12:12:39 +0200 Subject: [PATCH] fix(caldav): encoding inconsistencies in event search provider Signed-off-by: Richard Steinmetz --- apps/dav/lib/Search/EventsSearchProvider.php | 2 +- apps/dav/tests/unit/Search/EventsSearchProviderTest.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/Search/EventsSearchProvider.php b/apps/dav/lib/Search/EventsSearchProvider.php index 236ba5554ee2f..5dd4a753b56d8 100644 --- a/apps/dav/lib/Search/EventsSearchProvider.php +++ b/apps/dav/lib/Search/EventsSearchProvider.php @@ -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; } diff --git a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php index aa4d15f702e11..f7dc4f6b7e30c 100644 --- a/apps/dav/tests/unit/Search/EventsSearchProviderTest.php +++ b/apps/dav/tests/unit/Search/EventsSearchProviderTest.php @@ -412,6 +412,7 @@ public static function provideDeepLinkData(): array { return [ ['principals/users/john.doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obi5kb2UvZm9vL2Jhci5pY3M='], ['principals/users/John Doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvSm9obiUyMERvZS9mb28vYmFyLmljcw=='], + ['principals/users/john@doe', 'bGluay10by1yZW1vdGUucGhwL2Rhdi9jYWxlbmRhcnMvam9obkBkb2UvZm9vL2Jhci5pY3M='], ]; }