diff options
author | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-28 22:14:32 +0100 |
---|---|---|
committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2012-12-28 22:14:32 +0100 |
commit | 7b72424a39688adbfd382f63899b200a3170884f (patch) | |
tree | b58504f87197931623a996e8ee64abdceddb91fa /apps/files/admin.php | |
parent | e9c51b319e3d0a8017b769ea0b27b5bd99fcc705 (diff) | |
download | nextcloud-server-7b72424a39688adbfd382f63899b200a3170884f.tar.gz nextcloud-server-7b72424a39688adbfd382f63899b200a3170884f.zip |
Revert "fixed max possible upload size for files app in admin screen"
This reverts commit 7f2208b9a11f608e7d726bf426fe4c2a672e058a.
Conflicts:
apps/files/admin.php
Diffstat (limited to 'apps/files/admin.php')
-rw-r--r-- | apps/files/admin.php | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/apps/files/admin.php b/apps/files/admin.php index 80fd4f4e4a5..25645a4bcc9 100644 --- a/apps/files/admin.php +++ b/apps/files/admin.php @@ -30,11 +30,8 @@ OCP\User::checkAdminUser(); $htaccessWorking=(getenv('htaccessWorking')=='true'); $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); -$upload_max_filesize_possible = OCP\Util::computerFileSize(get_cfg_var('upload_max_filesize')); $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); -$post_max_size_possible = OCP\Util::computerFileSize(get_cfg_var('post_max_size')); $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size)); -$maxUploadFilesizePossible = OCP\Util::humanFileSize(min($upload_max_filesize_possible, $post_max_size_possible)); if($_POST && OC_Util::isCallRegistered()) { if(isset($_POST['maxUploadSize'])) { if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) { @@ -60,7 +57,7 @@ $htaccessWritable=is_writable(OC::$SERVERROOT.'/.htaccess'); $tmpl = new OCP\Template( 'files', 'admin' ); $tmpl->assign( 'uploadChangable', $htaccessWorking and $htaccessWritable ); $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize); -$tmpl->assign( 'maxPossibleUploadSize', $maxUploadFilesizePossible); +$tmpl->assign( 'maxPossibleUploadSize', OCP\Util::humanFileSize(PHP_INT_MAX)); $tmpl->assign( 'allowZipDownload', $allowZipDownload); $tmpl->assign( 'maxZipInputSize', $maxZipInputSize); return $tmpl->fetchPage(); |