aboutsummaryrefslogtreecommitdiffstats
path: root/apps/dav/lib/CalDAV
diff options
context:
space:
mode:
authorVinicius Cubas Brand <viniciuscb@gmail.com>2019-02-07 21:30:00 -0200
committerGeorg Ehrke <developer@georgehrke.com>2019-03-01 10:40:54 +0100
commit5e37b52241381e5b0f57c58a88a5dbcf0870b3bd (patch)
treea76cebec60a39ea516f780ea943b598b2c686085 /apps/dav/lib/CalDAV
parentfb5a2496e223528e798725335806c554b7cc28db (diff)
downloadnextcloud-server-5e37b52241381e5b0f57c58a88a5dbcf0870b3bd.tar.gz
nextcloud-server-5e37b52241381e5b0f57c58a88a5dbcf0870b3bd.zip
Share calendar to circle
* Allow user to share calendar with a circle * Allow user to see calendars shared with his/her circles Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
Diffstat (limited to 'apps/dav/lib/CalDAV')
-rw-r--r--apps/dav/lib/CalDAV/CalDavBackend.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/dav/lib/CalDAV/CalDavBackend.php b/apps/dav/lib/CalDAV/CalDavBackend.php
index 88ee778e82c..14de848013f 100644
--- a/apps/dav/lib/CalDAV/CalDavBackend.php
+++ b/apps/dav/lib/CalDAV/CalDavBackend.php
@@ -12,6 +12,8 @@
* @author Stefan Weil <sw@weilnetz.de>
* @author Thomas Citharel <tcit@tcit.fr>
* @author Thomas Müller <thomas.mueller@tmit.eu>
+ * @author Vinicius Cubas Brand <vinicius@eita.org.br>
+ * @author Daniel Tygel <dtygel@eita.org.br>
*
* @license AGPL-3.0
*
@@ -301,6 +303,8 @@ class CalDavBackend extends AbstractBackend implements SyncSupport, Subscription
// query for shared calendars
$principals = $this->principalBackend->getGroupMembership($principalUriOriginal, true);
+ $principals = array_merge($principals, $this->principalBackend->getCircleMembership($principalUriOriginal));
+
$principals = array_map(function($principal) {
return urldecode($principal);
}, $principals);