From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 20 Feb 2013 09:55:20 +0000 (+0100)
Subject: Merge branch 'master' into master-sqlserver
X-Git-Tag: v5.0.0RC1~50^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=5062ae250b767867609f64c29ab4cde65f022b75;p=nextcloud-server.git

Merge branch 'master' into master-sqlserver

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

5062ae250b767867609f64c29ab4cde65f022b75
diff --cc lib/files/cache/cache.php
index 77fc91b9379,3652dc7cf23..01e6e788263
--- a/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;