From 6a19124a0970dfd5744c4a193b5d907ba85b323e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Mon, 10 Apr 2017 20:01:10 +0200 Subject: Use raw bytes for upload size hidden input --- application/Utils.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'application') diff --git a/application/Utils.php b/application/Utils.php index 3ef2a7e2..ab463af9 100644 --- a/application/Utils.php +++ b/application/Utils.php @@ -414,23 +414,24 @@ function human_bytes($bytes) $bytes /= 1024; } - return $bytes . $units[$i]; + return round($bytes) . $units[$i]; } /** * Try to determine max file size for uploads (POST). - * Returns an integer (in bytes) + * Returns an integer (in bytes) or formatted depending on $format. * * @param mixed $limitPost post_max_size PHP setting * @param mixed $limitUpload upload_max_filesize PHP setting + * @param bool $format Format max upload size to human readable size * - * @return int max upload file size in bytes. + * @return int|string max upload file size */ -function get_max_upload_size($limitPost, $limitUpload) +function get_max_upload_size($limitPost, $limitUpload, $format = true) { $size1 = return_bytes($limitPost); $size2 = return_bytes($limitUpload); // Return the smaller of two: $maxsize = min($size1, $size2); - return human_bytes($maxsize); + return $format ? human_bytes($maxsize) : $maxsize; } -- cgit v1.2.3