From c9bd2f7a6c1e72a2ed6d7aa5f180e2c0757ac24c Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 11 Apr 2014 11:54:14 +0200
Subject: [PATCH] also fetch the etag from file cache
---
apps/files_sharing/lib/cache.php | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/apps/files_sharing/lib/cache.php b/apps/files_sharing/lib/cache.php
index 11f180bf7e..bce22a74ba 100644
--- a/apps/files_sharing/lib/cache.php
+++ b/apps/files_sharing/lib/cache.php
@@ -102,7 +102,7 @@ class Shared_Cache extends Cache {
}
$query = \OC_DB::prepare(
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,'
- . ' `size`, `mtime`, `encrypted`, `unencrypted_size`, `storage_mtime`'
+ . ' `size`, `mtime`, `encrypted`, `unencrypted_size`, `storage_mtime`, `etag`'
. ' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
$result = $query->execute(array($file));
$data = $result->fetchRow();
@@ -212,6 +212,7 @@ class Shared_Cache extends Cache {
* @param string $file
*/
public function remove($file) {
+ $file = ($file === false) ? '' : $file;
if ($cache = $this->getSourceCache($file)) {
$cache->remove($this->files[$file]);
}
--
GitLab