diff options
author | Robin Appelman <icewind@owncloud.com> | 2012-10-17 13:14:17 +0200 |
---|---|---|
committer | Robin Appelman <icewind@owncloud.com> | 2012-10-17 13:14:17 +0200 |
commit | 77cef5f5142d340117add03fd95e1430a3868eb7 (patch) | |
tree | 94d7430fdfabfb7ae9aaac9e66165ee58f3dc1da /lib/connector/sabre/directory.php | |
parent | 11e9ce25e622ea3a98c8085717541620fb878a69 (diff) | |
parent | 04824162d9230faaf0992b3b0e3e52e01011bf78 (diff) | |
download | nextcloud-server-77cef5f5142d340117add03fd95e1430a3868eb7.tar.gz nextcloud-server-77cef5f5142d340117add03fd95e1430a3868eb7.zip |
merge master into filesystem
Diffstat (limited to 'lib/connector/sabre/directory.php')
-rw-r--r-- | lib/connector/sabre/directory.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php index 4fff3ba51b8..3df85b2bbbe 100644 --- a/lib/connector/sabre/directory.php +++ b/lib/connector/sabre/directory.php @@ -200,7 +200,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa public function getProperties($properties) { $props = parent::getProperties($properties); if (in_array(self::GETETAG_PROPERTYNAME, $properties) && !isset($props[self::GETETAG_PROPERTYNAME])) { - $props[self::GETETAG_PROPERTYNAME] + $props[self::GETETAG_PROPERTYNAME] = OC_Connector_Sabre_Node::getETagPropertyForPath($this->path); } return $props; |