From: Björn Schießle <schiessle@owncloud.com>
Date: Wed, 22 May 2013 13:29:22 +0000 (+0200)
Subject: Merge branch 'master' into files_encryption
X-Git-Tag: v6.0.0alpha2~743^2~11
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ee53bd1aa3e3cb62a93dfda66141e3537426d5dd;p=nextcloud-server.git

Merge branch 'master' into files_encryption

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

ee53bd1aa3e3cb62a93dfda66141e3537426d5dd
diff --cc lib/files/cache/cache.php
index 1a8435a46fc,3341fe50525..b912b4423e7
--- a/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@@ -145,9 -144,12 +145,13 @@@ class Cache 
  		$fileId = $this->getId($folder);
  		if ($fileId > -1) {
  			$query = \OC_DB::prepare(
 -				'SELECT `fileid`, `storage`, `path`, `parent`, `name`, `mimetype`, `mimepart`, `size`, `mtime`, `storage_mtime`, `encrypted`, `etag`
 -				 FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
 +				'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');
++			 	 FROM `*PREFIX*filecache` WHERE `parent` = ? ORDER BY `name` ASC');
++
  			$result = $query->execute(array($fileId));
+ 			if (\OC_DB::isError($result)) {
+ 				\OCP\Util::writeLog('cache', 'getFolderContents failed: ' . $result->getMessage(), \OCP\Util::ERROR);
+ 			}
  			$files = $result->fetchAll();
  			foreach ($files as &$file) {
  				$file['mimetype'] = $this->getMimetype($file['mimetype']);