summaryrefslogtreecommitdiffstats
path: root/lib/private/files.php
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-05-03 11:49:38 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-05-03 11:49:38 +0200
commit623161b9a92dacc54ce198e9f762c8760b73ca00 (patch)
treefec399a54168cfe7414d8ea591868a9600059bb4 /lib/private/files.php
parentcf20de185c95847810e6d0423d67f5bbc6506c2d (diff)
parent1245ff8f318fafd66eed1ba8f9f2b3755aa537ca (diff)
downloadnextcloud-server-623161b9a92dacc54ce198e9f762c8760b73ca00.tar.gz
nextcloud-server-623161b9a92dacc54ce198e9f762c8760b73ca00.zip
Merge pull request #8023 from flyser/master
Fix setting the max-upload-size for really large values.
Diffstat (limited to 'lib/private/files.php')
-rw-r--r--lib/private/files.php4
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/private/files.php b/lib/private/files.php
index 152595ba697..3affcf10449 100644
--- a/lib/private/files.php
+++ b/lib/private/files.php
@@ -279,9 +279,7 @@ class OC_Files {
return false;
$size -= 1;
} else {
- $size = OC_Helper::humanFileSize($size);
- $size = substr($size, 0, -1); //strip the B
- $size = str_replace(' ', '', $size); //remove the space between the size and the postfix
+ $size = OC_Helper::phpFileSize($size);
}
//don't allow user to break his config -- broken or malicious size input