[Pkg-owncloud-commits] [owncloud] 107/273: always regenerate etag when writing back file to objectstore

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository owncloud.

commit 23fa75f5acfbef0b5e3d93128c8c76aee73044dd
Author: Jörn Friedrich Dreyer <jfd at butonic.de>
Date:   Fri Jun 27 18:49:06 2014 +0200

    always regenerate etag when writing back file to objectstore
---
 lib/private/files/objectstore/objectstorestorage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/files/objectstore/objectstorestorage.php
index 85f43b9..0292d77 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 {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git