diff options
| author | Thomas Citharel <tcit@tcit.fr> | 2016-08-14 19:18:21 +0200 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2016-09-26 11:55:41 +0200 |
| commit | 6378dbca7e1559def51b9f80174f559174aeb2e8 (patch) | |
| tree | 08ae23961bf5d52e738925c073d69d4a7edae607 /apps | |
| parent | f0421e1f75179a42e76973a4b11d8474ee571d08 (diff) | |
| download | nextcloud-server-6378dbca7e1559def51b9f80174f559174aeb2e8.tar.gz nextcloud-server-6378dbca7e1559def51b9f80174f559174aeb2e8.zip | |
fix can-be-published
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CalDAV/Calendar.php | 4 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Publishing/PublishPlugin.php | 2 |
2 files changed, 5 insertions, 1 deletions
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(); }); } } |