summaryrefslogtreecommitdiffstats
path: root/lib/connector/sabre/directory.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2013-02-02 15:44:05 +0100
committerRobin Appelman <icewind@owncloud.com>2013-02-02 15:44:05 +0100
commitc61c98cbef9cc6ece60175d5cf45dbc6d5a1ca41 (patch)
treec42ab319bb9afe884593d19fde70a66335f6a9d9 /lib/connector/sabre/directory.php
parent23166aa016a85c237de6f4f532578dfbef0fe09b (diff)
downloadnextcloud-server-c61c98cbef9cc6ece60175d5cf45dbc6d5a1ca41.tar.gz
nextcloud-server-c61c98cbef9cc6ece60175d5cf45dbc6d5a1ca41.zip
Dav: don't overwrite etag from filecache with old etag from properties table
Diffstat (limited to 'lib/connector/sabre/directory.php')
-rw-r--r--lib/connector/sabre/directory.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index a7201579366..b210602bbf4 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -138,7 +138,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
$propertypath = $row['propertypath'];
$propertyname = $row['propertyname'];
$propertyvalue = $row['propertyvalue'];
- $properties[$propertypath][$propertyname] = $propertyvalue;
+ if($propertyname !== self::GETETAG_PROPERTYNAME) {
+ $properties[$propertypath][$propertyname] = $propertyvalue;
+ }
}
}
}