summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2018-09-03 09:04:55 +0200
committerGitHub <noreply@github.com>2018-09-03 09:04:55 +0200
commit0d8c0215d0979388fddbc97ec3fc67f57f91a03d (patch)
tree827583fc23a35c0330642e28e8d97483e909d1f6
parentf73724b5ec4695ad016ac2d2e55c95124104dc96 (diff)
parent8a3f6a816baa49521b64b89d86bf458166539c68 (diff)
downloadnextcloud-server-0d8c0215d0979388fddbc97ec3fc67f57f91a03d.tar.gz
nextcloud-server-0d8c0215d0979388fddbc97ec3fc67f57f91a03d.zip
Merge pull request #10911 from nextcloud/customproperties-ignored-list-13
[13] use the same ignored properties list for both CustomerPropertiesBackends
-rw-r--r--apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php1
-rw-r--r--apps/dav/lib/DAV/CustomPropertiesBackend.php1
2 files changed, 1 insertions, 1 deletions
diff --git a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
index d08917ff35d..c77a4d6be48 100644
--- a/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
+++ b/apps/dav/lib/Connector/Sabre/CustomPropertiesBackend.php
@@ -47,7 +47,6 @@ class CustomPropertiesBackend implements BackendInterface {
'{DAV:}getetag',
'{DAV:}quota-used-bytes',
'{DAV:}quota-available-bytes',
- '{DAV:}quota-available-bytes',
'{http://owncloud.org/ns}permissions',
'{http://owncloud.org/ns}downloadURL',
'{http://owncloud.org/ns}dDC',
diff --git a/apps/dav/lib/DAV/CustomPropertiesBackend.php b/apps/dav/lib/DAV/CustomPropertiesBackend.php
index a5ad3e22acc..99a9f4e0b82 100644
--- a/apps/dav/lib/DAV/CustomPropertiesBackend.php
+++ b/apps/dav/lib/DAV/CustomPropertiesBackend.php
@@ -49,6 +49,7 @@ class CustomPropertiesBackend implements BackendInterface {
'{http://owncloud.org/ns}downloadURL',
'{http://owncloud.org/ns}dDC',
'{http://owncloud.org/ns}size',
+ '{http://nextcloud.org/ns}is-encrypted',
);
/**