wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1419 from owncloud/etag_fix

Browse source 
Dav: don't overwrite etag from filecache with old etag from properties table
This commit is contained in:
Thomas Müller 2013-02-02 12:06:48 -08:00
commit 561e6c4c5b
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/connector/sabre/directory.php
View file

@ -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;
}
}
}
}

4
lib/connector/sabre/node.php
View file

@ -154,7 +154,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
}
}
else {
if( strcmp( $propertyName, self::LASTMODIFIED_PROPERTYNAME) === 0 ) {
if( strcmp( $propertyName, self::GETETAG_PROPERTYNAME) === 0 ) {
\OC\Files\Filesystem::putFileInfo($this->path, array('etag'=> $propertyValue));
} elseif( strcmp( $propertyName, self::LASTMODIFIED_PROPERTYNAME) === 0 ) {
$this->touch($propertyValue);
} else {
if(!array_key_exists( $propertyName, $existing )) {