summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_shared.inc6
2 files changed, 4 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 74181f52a..03f792410 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix displaying of big maximum upload filesize (#1485889)
- Added possibility to invert messages selection
- After move/delete from 'show' action display next message instead of messages list (#1485887)
- Fixed problem with double quote at the end of folder name (#1485884)
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 9bbc8299b..9278654e3 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -238,12 +238,12 @@ function get_boolean($str)
* Parse a human readable string for a number of bytes
*
* @param string Input string
- * @return int Number of bytes
+ * @return float Number of bytes
*/
function parse_bytes($str)
{
if (is_numeric($str))
- return intval($str);
+ return floatval($str);
if (preg_match('/([0-9]+)([a-z])/i', $str, $regs))
{
@@ -262,7 +262,7 @@ function parse_bytes($str)
}
}
- return intval($bytes);
+ return floatval($bytes);
}
/**