summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBjörn Schießle <schiessle@owncloud.com>2016-04-22 14:50:42 +0200
committerBjörn Schießle <schiessle@owncloud.com>2016-04-22 14:50:42 +0200
commit606b756a94643eaae87e18b39f6c75e6d18fec7e (patch)
tree6128dd0ed676164bbfb8a4aa10a56cc511728edd /lib
parentcc4efc4c03f4d4f7ec9e6cf9beac570254bef3c1 (diff)
parent2a6a336e873db394e9912de20478645f3e4b8fc4 (diff)
downloadnextcloud-server-606b756a94643eaae87e18b39f6c75e6d18fec7e.tar.gz
nextcloud-server-606b756a94643eaae87e18b39f6c75e6d18fec7e.zip
Merge pull request #23918 from owncloud/cruds-for-federated-shares
bring back CRUDS permissions for federated shares
Diffstat (limited to 'lib')
-rw-r--r--lib/private/files/storage/dav.php6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/private/files/storage/dav.php b/lib/private/files/storage/dav.php
index df0f4c7e91d..8eebea1f3ba 100644
--- a/lib/private/files/storage/dav.php
+++ b/lib/private/files/storage/dav.php
@@ -246,7 +246,7 @@ class DAV extends Common {
*
* @throws NotFound
*/
- private function propfind($path) {
+ protected function propfind($path) {
$path = $this->cleanPath($path);
$cachedResponse = $this->statCache->get($path);
if ($cachedResponse === false) {
@@ -264,6 +264,7 @@ class DAV extends Common {
'{DAV:}getcontentlength',
'{DAV:}getcontenttype',
'{http://owncloud.org/ns}permissions',
+ '{http://open-collaboration-services.org/ns}share-permissions',
'{DAV:}resourcetype',
'{DAV:}getetag',
)
@@ -741,6 +742,9 @@ class DAV extends Common {
}
if (!empty($etag) && $cachedData['etag'] !== $etag) {
return true;
+ } else if (isset($response['{http://open-collaboration-services.org/ns}share-permissions'])) {
+ $sharePermissions = (int)$response['{http://open-collaboration-services.org/ns}share-permissions'];
+ return $sharePermissions !== $cachedData['permissions'];
} else if (isset($response['{http://owncloud.org/ns}permissions'])) {
$permissions = $this->parsePermissions($response['{http://owncloud.org/ns}permissions']);
return $permissions !== $cachedData['permissions'];