summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-03-07 14:47:01 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-03-07 14:47:01 +0100
commit8ef760eb5d213844767ef4b79777b4e90a467ef7 (patch)
tree9c3f57414032df49af8b6f0e083c2278af853727 /apps
parent4324d302bc404693d5a45adf5c6dc099ca2c2e3d (diff)
parent60d8046c3574a5cc9c30bdfee57da9e1b3cec27c (diff)
downloadnextcloud-server-8ef760eb5d213844767ef4b79777b4e90a467ef7.tar.gz
nextcloud-server-8ef760eb5d213844767ef4b79777b4e90a467ef7.zip
Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
Fix uploading to fed share when free space is unlimited
Diffstat (limited to 'apps')
-rw-r--r--apps/files/ajax/upload.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 36aaed5ad9e..d14414125f5 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -138,7 +138,7 @@ $maxHumanFileSize = OCP\Util::humanFileSize($maxUploadFileSize);
$totalSize = 0;
$isReceivedShare = \OC::$server->getRequest()->getParam('isReceivedShare', false) === 'true';
// defer quota check for received shares
-if (!$isReceivedShare) {
+if (!$isReceivedShare && $storageStats['freeSpace'] >= 0) {
foreach ($files['size'] as $size) {
$totalSize += $size;
}