From 7e701504be9352d21a25d17adca45dc5ed79d792 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 19 Sep 2016 21:29:48 +0200 Subject: 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 --- apps/files_sharing/lib/Controller/ShareController.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'apps/files_sharing/lib') 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(); -- cgit v1.2.3