summaryrefslogtreecommitdiffstats
path: root/apps/files/lib/Settings
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2016-08-22 10:10:28 +0200
committerRoeland Jago Douma <roeland@famdouma.nl>2016-08-22 20:25:58 +0200
commitf744131b18c97f84dd8868a1cee1879c5ea5cbb9 (patch)
treebdd698a6b84ba96c90249f4ba3f1d789f427e4ef /apps/files/lib/Settings
parent94992772b27b1f9c87d82a385932d3d93e45c750 (diff)
downloadnextcloud-server-f744131b18c97f84dd8868a1cee1879c5ea5cbb9.tar.gz
nextcloud-server-f744131b18c97f84dd8868a1cee1879c5ea5cbb9.zip
Do not error on maxUploadChange
The new admin page broke the updating of the max upload size. This is due to very old code there. * Now update is done in the background using js * Added proper route+controller to update Fixes #994
Diffstat (limited to 'apps/files/lib/Settings')
-rw-r--r--apps/files/lib/Settings/Admin.php7
1 files changed, 0 insertions, 7 deletions
diff --git a/apps/files/lib/Settings/Admin.php b/apps/files/lib/Settings/Admin.php
index 9ec23d47517..da1d5deaf35 100644
--- a/apps/files/lib/Settings/Admin.php
+++ b/apps/files/lib/Settings/Admin.php
@@ -53,13 +53,6 @@ class Admin implements ISettings {
$upload_max_filesize = $this->iniWrapper->getBytes('upload_max_filesize');
$post_max_size = $this->iniWrapper->getBytes('post_max_size');
$maxUploadFilesize = Util::humanFileSize(min($upload_max_filesize, $post_max_size));
- if($_POST && $this->request->passesCSRFCheck()) {
- if(isset($_POST['maxUploadSize'])) {
- if(($setMaxSize = \OC_Files::setUploadLimit(Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
- $maxUploadFilesize = Util::humanFileSize($setMaxSize);
- }
- }
- }
$parameters = [
'uploadChangable' => (($htaccessWorking and $htaccessWritable) or $userIniWritable ),