diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-18 08:18:27 -0700 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-03-18 08:18:27 -0700 |
| commit | 5b1f857907d8c16fde4c3efbec8b80a22ebe0865 (patch) | |
| tree | b2b83f096df46f58461a1a3b39751ff80e3e878d /apps | |
| parent | c262ad56b3e842da5bbc5e830dbdb1aadb6e32e5 (diff) | |
| parent | 8a97afac6f7ba2e552c01ff3cb0477f5beb8fc92 (diff) | |
| download | nextcloud-server-5b1f857907d8c16fde4c3efbec8b80a22ebe0865.tar.gz nextcloud-server-5b1f857907d8c16fde4c3efbec8b80a22ebe0865.zip | |
Merge pull request #2363 from owncloud/uploadsize
Improve behaviour when max upload size is unknown
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/ajax/upload.php | 2 | ||||
| -rw-r--r-- | apps/files/templates/index.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php index 5b697777e47..b9eea2fea62 100644 --- a/apps/files/ajax/upload.php +++ b/apps/files/ajax/upload.php @@ -47,7 +47,7 @@ $totalSize = 0; foreach ($files['size'] as $size) { $totalSize += $size; } -if ($totalSize > $maxUploadFilesize) { +if ($maxUploadFilesize >= 0 and $totalSize > $maxUploadFilesize) { OCP\JSON::error(array('data' => array('message' => $l->t('Not enough storage available'), 'uploadMaxFilesize' => $maxUploadFilesize, 'maxHumanFilesize' => $maxHumanFilesize))); diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php index a53df4e2d3e..0d7185bcb78 100644 --- a/apps/files/templates/index.php +++ b/apps/files/templates/index.php @@ -23,8 +23,10 @@ method="post" enctype="multipart/form-data" target="file_upload_target_1"> + <?php if($_['uploadMaxFilesize'] >= 0):?> <input type="hidden" name="MAX_FILE_SIZE" id="max_upload" value="<?php p($_['uploadMaxFilesize']) ?>"> + <?php endif;?> <!-- Send the requesttoken, this is needed for older IE versions because they don't send the CSRF token via HTTP header in this case --> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>" id="requesttoken"> |