No decimal points for Kilobyte and Byte #5371.

diff --git a/core/js/js.js b/core/js/js.js
index f5991cfc9dd4683a6cdd22d3f12231432859ad3a..b838e9578e77c5c3eca8b9f0d56d2cf03e1e3d9b 100644 (file)
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -825,7 +825,10 @@ function humanFileSize(size) {
        order = Math.min(humanList.length - 1, order);
        var readableFormat = humanList[order];
        var relativeSize = (size / Math.pow(1024, order)).toFixed(1);
-       if(relativeSize.substr(relativeSize.length-2,2)=='.0'){
+       if(order < 2){
+               relativeSize = parseFloat(relativeSize).toFixed(0);
+    }
+       else if(relativeSize.substr(relativeSize.length-2,2)==='.0'){
                relativeSize=relativeSize.substr(0,relativeSize.length-2);
        }
        return relativeSize + ' ' + readableFormat;

diff --git a/lib/private/helper.php b/lib/private/helper.php
index c82d3bd4ef4ab1d513a7ca83e0986b49bd9023f8..4fe3097af265f970200eb4b2a2549d9bc4447e32 100644 (file)
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -252,7 +252,7 @@ class OC_Helper {
                if ($bytes < 1024) {
                        return "$bytes B";
                }
-               $bytes = round($bytes / 1024, 1);
+               $bytes = round($bytes / 1024, 0);
                if ($bytes < 1024) {
                        return "$bytes kB";
                }