diff options
| author | icewind1991 <robin@icewind.nl> | 2014-03-17 15:21:57 +0100 |
|---|---|---|
| committer | icewind1991 <robin@icewind.nl> | 2014-03-17 15:21:57 +0100 |
| commit | 5c72b526a39647ee5c852793002ad14efbf13ca1 (patch) | |
| tree | 271521b8b5ecde7df2daf4862eb475e22fa6253a | |
| parent | df7853363ad9566f73dbd897b53229cd4640361e (diff) | |
| parent | 145db370d1e83978d0e575a60d7d61fbe1039cc4 (diff) | |
| download | nextcloud-server-5c72b526a39647ee5c852793002ad14efbf13ca1.tar.gz nextcloud-server-5c72b526a39647ee5c852793002ad14efbf13ca1.zip | |
Merge pull request #7760 from owncloud/core-roundbytes
Correctly round bytes when converted from human readable format
| -rw-r--r-- | lib/private/helper.php | 4 | ||||
| -rw-r--r-- | tests/lib/helper.php | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/private/helper.php b/lib/private/helper.php index 0b1a26bbecd..807fa849637 100644 --- a/lib/private/helper.php +++ b/lib/private/helper.php @@ -308,7 +308,7 @@ class OC_Helper { /** * @brief Make a computer file size - * @param string $str file size in a fancy format + * @param string $str file size in human readable format * @return int a file size in bytes * * Makes 2kB to 2048. @@ -338,7 +338,7 @@ class OC_Helper { $bytes *= $bytes_array[$matches[1]]; } - $bytes = round($bytes, 2); + $bytes = round($bytes); return $bytes; } diff --git a/tests/lib/helper.php b/tests/lib/helper.php index 4311215795c..0943e6bc1b9 100644 --- a/tests/lib/helper.php +++ b/tests/lib/helper.php @@ -23,6 +23,7 @@ class Test_Helper extends PHPUnit_Framework_TestCase { array('0 B', 0), array('1 kB', 1024), array('9.5 MB', 10000000), + array('1.3 GB', 1395864371), array('465.7 GB', 500000000000), array('454.7 TB', 500000000000000), array('444.1 PB', 500000000000000000), @@ -41,8 +42,9 @@ class Test_Helper extends PHPUnit_Framework_TestCase { return array( array(0.0, "0 B"), array(1024.0, "1 kB"), + array(1395864371.0, '1.3 GB'), array(9961472.0, "9.5 MB"), - array(500041567436.8, "465.7 GB"), + array(500041567437.0, "465.7 GB"), ); } |