summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoricewind1991 <robin@icewind.nl>2014-04-02 18:40:34 +0200
committericewind1991 <robin@icewind.nl>2014-04-02 18:40:34 +0200
commit6d378515f8e0d1a88089d58c5cbc3a61df06887b (patch)
tree12eb3af854c287d66fc085b09ba2c0ea3f36dcb4
parenta6de5efbab351e88adeff0f0a988a18a800f9a50 (diff)
parent1e6a79e244e1bdb3b1d510201ff8146ae1cdce5c (diff)
downloadnextcloud-server-6d378515f8e0d1a88089d58c5cbc3a61df06887b.tar.gz
nextcloud-server-6d378515f8e0d1a88089d58c5cbc3a61df06887b.zip
Merge pull request #8014 from owncloud/uploadsize-reuse
Reuse known free space in the files app
-rw-r--r--apps/files/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index 4d765b69e41..cd9341d3b1d 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -97,7 +97,7 @@ $permissions = $dirInfo->getPermissions();
$storageInfo=OC_Helper::getStorageInfo($dir);
$freeSpace=$storageInfo['free'];
$uploadLimit=OCP\Util::uploadLimit();
-$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir);
+$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir, $freeSpace);
$publicUploadEnabled = $config->getAppValue('core', 'shareapi_allow_public_upload', 'yes');
// if the encryption app is disabled, than everything is fine (INIT_SUCCESSFUL status code)
$encryptionInitStatus = 2;