summaryrefslogtreecommitdiffstats
path: root/apps/files/index.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-10-24 15:32:29 +0200
committerRobin Appelman <icewind@owncloud.com>2012-10-24 15:32:29 +0200
commit7b150dfa963d81889b8d40bf3956795c9a712aec (patch)
tree30b73d83b7e59791848480a741390060d60c7605 /apps/files/index.php
parent56c7ee799cb13f7a4db60663f60b76cdf223614b (diff)
parent41898a473e8ece37c92e709f685c90d7952d1694 (diff)
downloadnextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.tar.gz
nextcloud-server-7b150dfa963d81889b8d40bf3956795c9a712aec.zip
merge master into filesystem
Diffstat (limited to 'apps/files/index.php')
-rw-r--r--apps/files/index.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files/index.php b/apps/files/index.php
index c3e174d12cf..192cd2696f2 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -87,7 +87,7 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
$freeSpace=\OC\Files\Filesystem::free_space($dir);
$freeSpace=max($freeSpace,0);
-$maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
+$maxUploadFilesize = min($maxUploadFilesize, $freeSpace);
$permissions = OCP\Share::PERMISSION_READ;
if (\OC\Files\Filesystem::isUpdatable($dir.'/')) {