summaryrefslogtreecommitdiffstats
path: root/files/admin.php
diff options
context:
space:
mode:
Diffstat (limited to 'files/admin.php')
-rw-r--r--files/admin.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/files/admin.php b/files/admin.php
index 09237dfc1d5..861b6037f3c 100644
--- a/files/admin.php
+++ b/files/admin.php
@@ -32,7 +32,9 @@ if(isset($_POST['maxUploadSize'])){
$maxUploadFilesize=$_POST['maxUploadSize'];
OC_Files::setUploadLimit(OC_Helper::computerFileSize($maxUploadFilesize));
}else{
- $maxUploadFilesize = ini_get('upload_max_filesize').'B';
+ $upload_max_filesize = OC_Helper::computerFileSize(ini_get('upload_max_filesize'));
+ $post_max_size = OC_Helper::computerFileSize(ini_get('post_max_size'));
+ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
}
OC_App::setActiveNavigationEntry( "files_administration" );