Merge pull request #9266 from owncloud/fix_objectstore_etag_update
always regenerate etag when writing back file to objectstore
This commit is contained in:
commit
9032ce4535
|
@ -385,7 +385,6 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
||||||
if (empty($stat)) {
|
if (empty($stat)) {
|
||||||
// create new file
|
// create new file
|
||||||
$stat = array(
|
$stat = array(
|
||||||
'etag' => $this->getETag($path),
|
|
||||||
'permissions' => \OCP\PERMISSION_ALL,
|
'permissions' => \OCP\PERMISSION_ALL,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -395,6 +394,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
||||||
$stat['mtime'] = $mTime;
|
$stat['mtime'] = $mTime;
|
||||||
$stat['storage_mtime'] = $mTime;
|
$stat['storage_mtime'] = $mTime;
|
||||||
$stat['mimetype'] = \OC_Helper::getMimeType($tmpFile);
|
$stat['mimetype'] = \OC_Helper::getMimeType($tmpFile);
|
||||||
|
$stat['etag'] = $this->getETag($path);
|
||||||
|
|
||||||
$fileId = $this->getCache()->put($path, $stat);
|
$fileId = $this->getCache()->put($path, $stat);
|
||||||
try {
|
try {
|
||||||
|
|
Loading…
Reference in New Issue