summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--application/helpers/filebin_helper.php2
-rw-r--r--application/test/tests/test_filebin_helper.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/application/helpers/filebin_helper.php b/application/helpers/filebin_helper.php
index 093f7a8bd..3344e5ecf 100644
--- a/application/helpers/filebin_helper.php
+++ b/application/helpers/filebin_helper.php
@@ -375,7 +375,7 @@ function return_bytes($size_str)
case 'K': case 'k': return (int)$size_str * 1024;
case 'M': case 'm': return (int)$size_str * 1048576;
case 'G': case 'g': return (int)$size_str * 1073741824;
- default: return $size_str;
+ default: return (int)$size_str;
}
}
diff --git a/application/test/tests/test_filebin_helper.php b/application/test/tests/test_filebin_helper.php
index edebb13ca..c505dfe8a 100644
--- a/application/test/tests/test_filebin_helper.php
+++ b/application/test/tests/test_filebin_helper.php
@@ -66,5 +66,6 @@ class test_filebin_helper extends \test\Test {
$this->t->is(return_bytes("1M"), 1*1024*1024, "1M");
$this->t->is(return_bytes("1G"), 1*1024*1024*1024, "1G");
$this->t->is(return_bytes("1P"), "1P", "unhandled text: 1P");
+ $this->t->ok(return_bytes("106954752") === 106954752, "value without unit is returned as int");
}
}