diff options
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Calendar.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/Node/Folder.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php index db79b0f6656..45bc3d71c4a 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php @@ -176,6 +176,8 @@ class Calendar extends Base { case self::SUBJECT_DELETE . '_self': case self::SUBJECT_UPDATE: case self::SUBJECT_UPDATE . '_self': + case self::SUBJECT_PUBLISH . '_self': + case self::SUBJECT_UNPUBLISH . '_self': case self::SUBJECT_SHARE_USER: case self::SUBJECT_UNSHARE_USER: case self::SUBJECT_UNSHARE_USER . '_self': diff --git a/lib/private/Files/Node/Folder.php b/lib/private/Files/Node/Folder.php index 95ceeee3698..0eb119eb0de 100644 --- a/lib/private/Files/Node/Folder.php +++ b/lib/private/Files/Node/Folder.php @@ -258,7 +258,7 @@ class Folder extends Node implements \OCP\Files\Folder { if ($storage) { $cache = $storage->getCache(''); - $relativeMountPoint = substr($mount->getMountPoint(), $rootLength); + $relativeMountPoint = ltrim(substr($mount->getMountPoint(), $rootLength), '/'); $results = call_user_func_array(array($cache, $method), $args); foreach ($results as $result) { $result['internalPath'] = $result['path']; |