diff options
author | Vincent Petry <pvince81@owncloud.com> | 2016-09-19 21:29:48 +0200 |
---|---|---|
committer | Roeland Jago Douma <roeland@famdouma.nl> | 2016-11-02 20:43:35 +0100 |
commit | 7e701504be9352d21a25d17adca45dc5ed79d792 (patch) | |
tree | 57a8c3b2945f26281f069777db6f8c689bc304b5 /apps/files_sharing/lib | |
parent | e6b52ef4cd1a92004895320d52f08b44a8b422d3 (diff) | |
download | nextcloud-server-7e701504be9352d21a25d17adca45dc5ed79d792.tar.gz nextcloud-server-7e701504be9352d21a25d17adca45dc5ed79d792.zip |
Remove upload_limit in files app as it is not needed with PUT upload (#26069)
The web UI now uses for PUT uploads which aren't restricted by PHP's
upload_max_filesize and post_max_size
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
Diffstat (limited to 'apps/files_sharing/lib')
-rw-r--r-- | apps/files_sharing/lib/Controller/ShareController.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 62725115dd6..5ad7d3a99f1 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -342,9 +342,8 @@ class ShareController extends Controller { $freeSpace = (INF > 0) ? INF: PHP_INT_MAX; // work around https://bugs.php.net/bug.php?id=69188 } - $uploadLimit = Util::uploadLimit(); - $maxUploadFilesize = min($freeSpace, $uploadLimit); $hideFileList = $share->getPermissions() & \OCP\Constants::PERMISSION_READ ? false : true; + $maxUploadFilesize = $freeSpace; $folder = new Template('files', 'list', ''); $folder->assign('dir', $rootFolder->getRelativePath($folderNode->getPath())); @@ -356,7 +355,6 @@ class ShareController extends Controller { $folder->assign('uploadMaxFilesize', $maxUploadFilesize); $folder->assign('uploadMaxHumanFilesize', \OCP\Util::humanFileSize($maxUploadFilesize)); $folder->assign('freeSpace', $freeSpace); - $folder->assign('uploadLimit', $uploadLimit); // PHP upload limit $folder->assign('usedSpacePercent', 0); $folder->assign('trash', false); $shareTmpl['folder'] = $folder->fetchPage(); |