Merge branch 'master' into files_encryption

Conflicts:
	lib/files/cache/cache.php

diff --cc lib/files/cache/cache.php
index 1a8435a46fc2206c6ece38698c0861880fecaeb7,3341fe50525991fbb9f7af757407c1edee4ff629..b912b4423e7fc4eed27bf23930c22330384f63ca
--- 1/lib/files/cache/cache.php
--- 2/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']);

diff --cc lib/user.php
Simple merge