aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/ucp/ucp_attachments.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-02-23 14:23:34 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-02-23 14:23:34 +0000
commit2cedbbac0944da85a01f3a3afbac65756610f29d (patch)
treea2302e0bfabf2800b44870c8b14d3c75a12dc612 /phpBB/includes/ucp/ucp_attachments.php
parent6dc85449c1feaed312bc25bbe624305f29e40036 (diff)
downloadforums-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/ucp/ucp_attachments.php')
-rw-r--r--phpBB/includes/ucp/ucp_attachments.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_attachments.php b/phpBB/includes/ucp/ucp_attachments.php
index 2732879913..5685702de2 100644
--- a/phpBB/includes/ucp/ucp_attachments.php
+++ b/phpBB/includes/ucp/ucp_attachments.php
@@ -150,7 +150,7 @@ class ucp_attachments
'FILENAME' => $row['real_filename'],
'COMMENT' => bbcode_nl2br($row['attach_comment']),
'EXTENSION' => $row['extension'],
- 'SIZE' => ($row['filesize'] >= 1048576) ? ($row['filesize'] >> 20) . ' ' . $user->lang['MB'] : (($row['filesize'] >= 1024) ? ($row['filesize'] >> 10) . ' ' . $user->lang['KB'] : $row['filesize'] . ' ' . $user->lang['BYTES']),
+ 'SIZE' => get_formatted_filesize($row['filesize']),
'DOWNLOAD_COUNT' => $row['download_count'],
'POST_TIME' => $user->format_date($row['filetime']),
'TOPIC_TITLE' => ($row['in_message']) ? $row['message_title'] : $row['topic_title'],