diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 14:23:34 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2008-02-23 14:23:34 +0000 |
| commit | 2cedbbac0944da85a01f3a3afbac65756610f29d (patch) | |
| tree | a2302e0bfabf2800b44870c8b14d3c75a12dc612 /phpBB/includes/functions_content.php | |
| parent | 6dc85449c1feaed312bc25bbe624305f29e40036 (diff) | |
| download | forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.gz forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.bz2 forums-2cedbbac0944da85a01f3a3afbac65756610f29d.tar.xz forums-2cedbbac0944da85a01f3a3afbac65756610f29d.zip | |
merge revisions #r8384, #r8387, #r8388, #r8389 and #r8390
git-svn-id: file:///svn/phpbb/trunk@8391 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 5f148da2f8..8d4a75e2f7 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -824,7 +824,7 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count, $filesize = $attachment['filesize']; $size_lang = ($filesize >= 1048576) ? $user->lang['MB'] : ( ($filesize >= 1024) ? $user->lang['KB'] : $user->lang['BYTES'] ); - $filesize = ($filesize >= 1048576) ? round((round($filesize / 1048576 * 100) / 100), 2) : (($filesize >= 1024) ? round((round($filesize / 1024 * 100) / 100), 2) : $filesize); + $filesize = get_formatted_filesize($filesize, false); $comment = bbcode_nl2br(censor_text($attachment['attach_comment'])); |