From: Thomas Müller <thomas.mueller@tmit.eu>
Date: Thu, 22 Aug 2013 15:59:39 +0000 (+0200)
Subject: Merge branch 'master' into fixing-4343-master
X-Git-Tag: v6.0.0alpha2~267^2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9e1016f7d2aa7c23fc6287a563e6551809edcbe8;p=nextcloud-server.git

Merge branch 'master' into fixing-4343-master

Conflicts:
	lib/connector/sabre/quotaplugin.php
---

9e1016f7d2aa7c23fc6287a563e6551809edcbe8
diff --cc lib/connector/sabre/quotaplugin.php
index eb95a839b86,34d4b676157..c8ce65a8576
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@@ -59,8 -50,8 +59,8 @@@ class OC_Connector_Sabre_QuotaPlugin ex
  				$uri='/'.$uri;
  			}
  			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
 -			$freeSpace = \OC\Files\Filesystem::free_space($parentUri);
 +			$freeSpace = $this->fileView->free_space($parentUri);
- 			if ($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN && $length > $freeSpace) {
+ 			if ($freeSpace !== \OC\Files\SPACE_UNKNOWN && $length > $freeSpace) {
  				throw new Sabre_DAV_Exception_InsufficientStorage();
  			}
  		}