also fetch the etag from file cache

This commit is contained in:
Bjoern Schiessle 2014-04-11 11:54:14 +02:00
parent dfb69e9418
commit c9bd2f7a6c

View file

@ -102,7 +102,7 @@ class Shared_Cache extends Cache {
} }
$query = \OC_DB::prepare( $query = \OC_DB::prepare(
'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`,' '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` = ?'); . ' FROM `*PREFIX*filecache` WHERE `fileid` = ?');
$result = $query->execute(array($file)); $result = $query->execute(array($file));
$data = $result->fetchRow(); $data = $result->fetchRow();
@ -212,6 +212,7 @@ class Shared_Cache extends Cache {
* @param string $file * @param string $file
*/ */
public function remove($file) { public function remove($file) {
$file = ($file === false) ? '' : $file;
if ($cache = $this->getSourceCache($file)) { if ($cache = $this->getSourceCache($file)) {
$cache->remove($this->files[$file]); $cache->remove($this->files[$file]);
} }