Skip to content

Commit 0679f60

Browse files
committed
urldecode group principals in Cal- and CardDAV backend
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
1 parent d00c588 commit 0679f60

2 files changed

Lines changed: 6 additions & 0 deletions

File tree

apps/dav/lib/CalDAV/CalDavBackend.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,9 @@ function getCalendarsForUser($principalUri) {
276276

277277
// query for shared calendars
278278
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
279+
$principals = array_map(function($principal) {
280+
return urldecode($principal);
281+
}, $principals);
279282
$principals[]= $principalUri;
280283

281284
$fields = array_values($this->propertyMap);

apps/dav/lib/CardDAV/CardDavBackend.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ function getAddressBooksForUser($principalUri) {
162162

163163
// query for shared calendars
164164
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
165+
$principals = array_map(function($principal) {
166+
return urldecode($principal);
167+
}, $principals);
165168
$principals[]= $principalUri;
166169

167170
$query = $this->db->getQueryBuilder();

0 commit comments

Comments
 (0)