diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-29 20:59:20 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-06-29 20:59:20 +0200 |
| commit | 9032ce45354ee67b4bbbeaa1843ed754c8745ac7 (patch) | |
| tree | 7dd29784a2f62828b882fd3ee40be6fe8078b4b9 | |
| parent | ebf93448f23ea1fa4d4614cc07d4fdeda8953380 (diff) | |
| parent | 23fa75f5acfbef0b5e3d93128c8c76aee73044dd (diff) | |
| download | nextcloud-server-9032ce45354ee67b4bbbeaa1843ed754c8745ac7.tar.gz nextcloud-server-9032ce45354ee67b4bbbeaa1843ed754c8745ac7.zip | |
Merge pull request #9266 from owncloud/fix_objectstore_etag_update
always regenerate etag when writing back file to objectstore
| -rw-r--r-- | lib/private/files/objectstore/objectstorestorage.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php index 85f43b90cbb..0292d777064 100644 --- a/lib/private/files/objectstore/objectstorestorage.php +++ b/lib/private/files/objectstore/objectstorestorage.php @@ -385,7 +385,6 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { if (empty($stat)) { // create new file $stat = array( - 'etag' => $this->getETag($path), 'permissions' => \OCP\PERMISSION_ALL, ); } @@ -395,6 +394,7 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common { $stat['mtime'] = $mTime; $stat['storage_mtime'] = $mTime; $stat['mimetype'] = \OC_Helper::getMimeType($tmpFile); + $stat['etag'] = $this->getETag($path); $fileId = $this->getCache()->put($path, $stat); try { |