diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 13:18:33 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 13:18:33 +0000 |
| commit | 6accc46024d436e69802793956653412cde8f404 (patch) | |
| tree | 8da891bff77f5629dec8ea200ca389916ed3e9dd /phpBB/includes/functions_admin.php | |
| parent | b5a1ddffa0b424d4e8d6b7b08cbbf3eec3d264bb (diff) | |
| download | forums-6accc46024d436e69802793956653412cde8f404.tar forums-6accc46024d436e69802793956653412cde8f404.tar.gz forums-6accc46024d436e69802793956653412cde8f404.tar.bz2 forums-6accc46024d436e69802793956653412cde8f404.tar.xz forums-6accc46024d436e69802793956653412cde8f404.zip | |
some language/style/code fixes (refer to the diff of the changelog)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8389 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 7fd21948d0..afaf165d66 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -196,7 +196,7 @@ function size_select_options($size_compare) { global $user; - $size_types_text = array($user->lang['BYTES'], $user->lang['KB'], $user->lang['MB']); + $size_types_text = array($user->lang['BYTES'], $user->lang['KIB'], $user->lang['MIB']); $size_types = array('b', 'kb', 'mb'); $s_size_options = ''; @@ -2878,14 +2878,7 @@ function get_database_size() break; } - if ($database_size !== false) - { - $database_size = ($database_size >= 1048576) ? sprintf('%.2f ' . $user->lang['MB'], ($database_size / 1048576)) : (($database_size >= 1024) ? sprintf('%.2f ' . $user->lang['KB'], ($database_size / 1024)) : sprintf('%.2f ' . $user->lang['BYTES'], $database_size)); - } - else - { - $database_size = $user->lang['NOT_AVAILABLE']; - } + $database_size = ($database_size !== false) ? get_formatted_filesize($database_size) : $user->lang['NOT_AVAILABLE']; return $database_size; } |