From: Florin Peter <github@florin-peter.de>
Date: Tue, 21 May 2013 23:22:36 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~13
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=28d72b822deadd9d4e510eefd3a0f76ebdf236ec;p=nextcloud-server.git

Merge branch 'master' into files_encryption

Conflicts:
	lib/files/cache/cache.php
---

28d72b822deadd9d4e510eefd3a0f76ebdf236ec
diff --cc lib/files/cache/cache.php
index 3c2649cb1be,0617471079b..1a8435a46fc
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@@ -107,7 -107,7 +107,7 @@@ class Cache 
  			$params = array($file);
  		}
  		$query = \OC_DB::prepare(
- 			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 -			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
++			'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
  			 FROM `*PREFIX*filecache` ' . $where);
  		$result = $query->execute($params);
  		$data = $result->fetchRow();
@@@ -142,7 -144,7 +145,7 @@@
  		$fileId = $this->getId($folder);
  		if ($fileId > -1) {
  			$query = \OC_DB::prepare(
- 				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `encrypted`, `unencrypted_size`, `etag`
 -				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
++				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `unencrypted_size`, `etag`
  			 	 FROM `*PREFIX*filecache` WHERE parent = ? ORDER BY `name` ASC');
  			$result = $query->execute(array($fileId));
  			$files = $result->fetchAll();
@@@ -225,7 -230,7 +231,7 @@@
  	 * @return array
  	 */
  	function buildParts(array $data) {
- 		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'encrypted', 'unencrypted_size', 'etag');
 -		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'etag');
++		$fields = array('path', 'parent', 'name', 'mimetype', 'size', 'mtime', 'storage_mtime', 'encrypted', 'unencrypted_size', 'etag');
  		$params = array();
  		$queryParts = array();
  		foreach ($data as $name => $value) {