[Pkg-owncloud-commits] [owncloud] 06/70: Remove etag warning in trashbin

[David Prévot]

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

taffit pushed a commit to annotated tag v6.0.5RC1
in repository owncloud.

commit da7641c232df03d862d36c364f7124c7b18699bf
Author: Vincent Petry <pvince81 at owncloud.com>
Date:   Thu Jun 26 10:50:59 2014 +0200

    Remove etag warning in trashbin
    
    When previews are available, the etag attribute is used for the icon.
    But when none is set, a warning is shown.
    
    This fix uses the timestamp as a dummy etag.
---
 apps/files_trashbin/lib/helper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index c454b35..9499410 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -51,6 +51,7 @@ class Helper
 			$i['name'] = $r['id'];
 			$i['date'] = \OCP\Util::formatDate($r['timestamp']);
 			$i['timestamp'] = $r['timestamp'];
+			$i['etag'] = $i['timestamp']; // dummy etag
 			$i['mimetype'] = $r['mime'];
 			$i['type'] = $r['type'];
 			if ($i['type'] === 'file') {

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