Merge branch 'master' into master-sqlserver

Conflicts:
	lib/files/cache/cache.php

diff --cc lib/files/cache/cache.php
index 77fc91b93797cd07988fce35ac072c2d62ed8150,3652dc7cf23a3ca2a17e468a7bec602e3bd96fd1..01e6e7882633376e44c0d08728f1aa5827141c77
--- 1/lib/files/cache/cache.php
--- 2/lib/files/cache/cache.php
+++ b/lib/files/cache/cache.php
@@@ -496,9 -499,9 +499,9 @@@ class Cache 
         */
        public function getIncomplete() {
                $query = \OC_DB::prepare('SELECT `path` FROM `*PREFIX*filecache`'
-                       .' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
+                       . ' WHERE `storage` = ? AND `size` = -1 ORDER BY `fileid` DESC LIMIT 1');
 -              $query->execute(array($this->numericId));
 -              if ($row = $query->fetchRow()) {
 +              $result = $query->execute(array($this->numericId));
 +              if ($row = $result->fetchRow()) {
                        return $row['path'];
                } else {
                        return false;