diff options
| author | Robin Appelman <icewind@owncloud.com> | 2013-01-20 03:11:04 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2013-01-20 03:11:04 +0100 |
| commit | 83d622132224fa61b1518e6bca430518cf138401 (patch) | |
| tree | 53f79474af81e07f1304a1cf10e866b2d8af652b /apps/files/index.php | |
| parent | 8ca30d244c19b33e7e3b0da247b70160a3acc44f (diff) | |
| parent | ebc0c4b85bc382efcf64ad0b2613d70a193b18f2 (diff) | |
| download | nextcloud-server-83d622132224fa61b1518e6bca430518cf138401.tar.gz nextcloud-server-83d622132224fa61b1518e6bca430518cf138401.zip | |
merge master into filesytem
Diffstat (limited to 'apps/files/index.php')
| -rw-r--r-- | apps/files/index.php | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apps/files/index.php b/apps/files/index.php index 854218eee55..c10ae76e9ea 100644 --- a/apps/files/index.php +++ b/apps/files/index.php @@ -28,6 +28,7 @@ OCP\User::checkLoggedIn(); OCP\Util::addStyle('files', 'files'); OCP\Util::addscript('files', 'jquery.iframe-transport'); OCP\Util::addscript('files', 'jquery.fileupload'); +OCP\Util::addscript('files', 'jquery-visibility'); OCP\Util::addscript('files', 'filelist'); OCP\Util::addscript('files', 'fileactions'); @@ -97,12 +98,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', ''); $breadcrumbNav->assign('breadcrumb', $breadcrumb, false); $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false); -$upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')); -$post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size')); -$maxUploadFilesize = min($upload_max_filesize, $post_max_size); - -$freeSpace = max($freeSpace, 0); -$maxUploadFilesize = min($maxUploadFilesize, $freeSpace); +$maxUploadFilesize=OCP\Util::maxUploadFilesize($dir); $permissions = OCP\PERMISSION_READ; if (\OC\Files\Filesystem::isUpdatable($dir . '/')) { |