summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-08-30 21:23:36 +0200
committerGitHub <noreply@github.com>2018-08-30 21:23:36 +0200
commit8ea2f8dea434d78c6c98f583806c96418885ad25 (patch)
treed9b6578ff4588ff7d2b7caf24041ae63a822b93b
parent625c81bd11690ccad99529e59fffe08e4a322b0e (diff)
parent3806ecb24236b37ce1dbf3bb5b444ca4d9dc971c (diff)
downloadnextcloud-server-8ea2f8dea434d78c6c98f583806c96418885ad25.tar.gz
nextcloud-server-8ea2f8dea434d78c6c98f583806c96418885ad25.zip
Merge pull request #10910 from nextcloud/customproperties-ignored-list
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',
);
/**