From 6378dbca7e1559def51b9f80174f559174aeb2e8 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sun, 14 Aug 2016 19:18:21 +0200 Subject: [PATCH] fix can-be-published --- apps/dav/lib/CalDAV/Calendar.php | 4 ++++ apps/dav/lib/CalDAV/Publishing/PublishPlugin.php | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/apps/dav/lib/CalDAV/Calendar.php b/apps/dav/lib/CalDAV/Calendar.php index bda671dfa43..d6799d1827b 100644 --- a/apps/dav/lib/CalDAV/Calendar.php +++ b/apps/dav/lib/CalDAV/Calendar.php @@ -279,4 +279,8 @@ class Calendar extends \Sabre\CalDAV\Calendar implements IShareable { return isset($this->calendarInfo['{http://owncloud.org/ns}owner-principal']); } + public function isSubscription() { + return isset($this->calendarInfo['{http://calendarserver.org/ns/}source']); + } + } diff --git a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php index 124901fd681..1b89578e3c9 100644 --- a/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php +++ b/apps/dav/lib/CalDAV/Publishing/PublishPlugin.php @@ -110,7 +110,7 @@ class PublishPlugin extends ServerPlugin { }); $propFind->handle('{'.self::NS_CALENDARSERVER.'}can-be-published', function() use ($node) { - return !$node->getPublishStatus(); + return !$node->getPublishStatus() && !$node->isSubscription(); }); } }