diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-20 10:55:20 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-20 10:55:20 +0100 |
| commit | 5062ae250b767867609f64c29ab4cde65f022b75 (patch) | |
| tree | ba624bec5f2470fbaadb4b281c57386210e5708e /lib/helper.php | |
| parent | 2675290325dc6a67f6719febe5ed0a546bd7a32a (diff) | |
| parent | 38782036798dbe0a34995a3fca0aa92583cb9099 (diff) | |
| download | nextcloud-server-5062ae250b767867609f64c29ab4cde65f022b75.tar.gz nextcloud-server-5062ae250b767867609f64c29ab4cde65f022b75.zip | |
Merge branch 'master' into master-sqlserver
Conflicts:
lib/files/cache/cache.php
Diffstat (limited to 'lib/helper.php')
| -rw-r--r-- | lib/helper.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/helper.php b/lib/helper.php index 0f810ffc0c2..add5c66e7be 100644 --- a/lib/helper.php +++ b/lib/helper.php @@ -762,9 +762,13 @@ class OC_Helper { $maxUploadFilesize = min($upload_max_filesize, $post_max_size); $freeSpace = \OC\Files\Filesystem::free_space($dir); - $freeSpace = max($freeSpace, 0); + if($freeSpace !== \OC\Files\FREE_SPACE_UNKNOWN){ + $freeSpace = max($freeSpace, 0); - return min($maxUploadFilesize, $freeSpace); + return min($maxUploadFilesize, $freeSpace); + } else { + return $maxUploadFilesize; + } } /** |