summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-01-30 21:54:18 +0100
committerGitHub <noreply@github.com>2018-01-30 21:54:18 +0100
commit48884c9b6a91e9c496cb4b535a2710e9de101a69 (patch)
tree05ea736c97caed735586c78ebf54e173744e8862 /apps
parent9a73a1f0635b05ff94e23cf7ac3918b130aef348 (diff)
parent9896b15ec89750263dbb1defb5938c3aede6f948 (diff)
downloadnextcloud-server-48884c9b6a91e9c496cb4b535a2710e9de101a69.tar.gz
nextcloud-server-48884c9b6a91e9c496cb4b535a2710e9de101a69.zip
Merge pull request #8111 from nextcloud/only_encrypted_prop_on_folders
Only handle encrypted property on folders
Diffstat (limited to 'apps')
-rw-r--r--apps/dav/lib/Connector/Sabre/FilesPlugin.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/dav/lib/Connector/Sabre/FilesPlugin.php b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
index b5333f48374..f36ebe5636c 100644
--- a/apps/dav/lib/Connector/Sabre/FilesPlugin.php
+++ b/apps/dav/lib/Connector/Sabre/FilesPlugin.php
@@ -339,10 +339,6 @@ class FilesPlugin extends ServerPlugin {
}
});
- $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) {
- return $node->getFileInfo()->isEncrypted() ? '1' : '0';
- });
-
$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
});
@@ -391,6 +387,10 @@ class FilesPlugin extends ServerPlugin {
$propFind->handle(self::SIZE_PROPERTYNAME, function() use ($node) {
return $node->getSize();
});
+
+ $propFind->handle(self::IS_ENCRYPTED_PROPERTYNAME, function() use ($node) {
+ return $node->getFileInfo()->isEncrypted() ? '1' : '0';
+ });
}
}