diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-16 10:25:06 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2012-11-16 10:25:06 -0500 |
| commit | af5d8b502ebf454e058794b8b082f62b4fa4cbe5 (patch) | |
| tree | 18877ee8661589c560bef8f66b9a3433d7c82d3b /phpBB | |
| parent | 17a7c4821aa9fb83e8addfd4f32cd8dfdc9d89fc (diff) | |
| parent | 8851f9589a5295d569316e76b366f1b16f1a9a96 (diff) | |
| download | forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.gz forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.bz2 forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.tar.xz forums-af5d8b502ebf454e058794b8b082f62b4fa4cbe5.zip | |
Merge PR #1074 branch 'bantu/ticket/11192' into develop-olympus
* bantu/ticket/11192:
[ticket/11192] Merge dataProvider arrays because the test is the same now.
[ticket/11192] Update $value parameter description to support other types.
[ticket/11192] Mark negative byte numbers as unsupported.
[ticket/11192] Test strings not converted to int/float before.
[ticket/11192] Also test strings, e.g. sums returned by the database.
[ticket/11192] Also test powers of 10 / 1000.
[ticket/11192] Add tests.
[ticket/11192] Add Tebibyte to get_formatted_filesize().
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions.php | 9 | ||||
| -rw-r--r-- | phpBB/language/en/common.php | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 65d8be32ad..6e661228b7 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -289,7 +289,8 @@ function phpbb_gmgetdate($time = false) /** * Return formatted string for filesizes * -* @param int $value filesize in bytes +* @param mixed $value filesize in bytes +* (non-negative number; int, float or string) * @param bool $string_only true if language string should be returned * @param array $allowed_units only allow these units (data array indexes) * @@ -301,6 +302,12 @@ function get_formatted_filesize($value, $string_only = true, $allowed_units = fa global $user; $available_units = array( + 'tb' => array( + 'min' => 1099511627776, // pow(2, 40) + 'index' => 4, + 'si_unit' => 'TB', + 'iec_unit' => 'TIB', + ), 'gb' => array( 'min' => 1073741824, // pow(2, 30) 'index' => 3, diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index 0184dd083b..844d5ef3ef 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -568,9 +568,11 @@ $lang = array_merge($lang, array( 'SUBJECT' => 'Subject', 'SUBMIT' => 'Submit', + 'TB' => 'TB', 'TERMS_USE' => 'Terms of use', 'TEST_CONNECTION' => 'Test connection', 'THE_TEAM' => 'The team', + 'TIB' => 'TiB', 'TIME' => 'Time', 'TOO_LARGE' => 'The value you entered is too large.', |