summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2014-12-29 14:26:18 +0100
committerAleksander Machniak <alec@alec.pl>2014-12-29 14:26:18 +0100
commit1881a8a15291c5777144fecfa691d7634eee9c0d (patch)
treeab4803a3cae7c78dc94e53c2dfcb083101e0b3ed /program/steps
parentbca7dc68e9f73e863e3a65173a8883c99dc09e3a (diff)
Display "real" attachment size also on attachments list
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/show.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index d9233a923..747cbc2a0 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -199,11 +199,10 @@ function rcmail_message_attachments($attrib)
if (sizeof($MESSAGE->attachments)) {
foreach ($MESSAGE->attachments as $attach_prop) {
$filename = rcmail_attachment_name($attach_prop, true);
- $size = '';
+ $filesize = $RCMAIL->message_part_size($attach_prop);
if ($PRINT_MODE) {
- $size = $RCMAIL->message_part_size($attach_prop);
- $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $size)));
+ $ol .= html::tag('li', null, rcube::Q(sprintf("%s (%s)", $filename, $filesize)));
}
else {
if ($attrib['maxlength'] && mb_strlen($filename) > $attrib['maxlength']) {
@@ -215,7 +214,7 @@ function rcmail_message_attachments($attrib)
}
if ($attach_prop->size) {
- $size = ' ' . html::span('attachment-size', '(' . $RCMAIL->show_bytes($attach_prop->size) . ')');
+ $size = ' ' . html::span('attachment-size', '(' . rcube::Q($filesize) . ')');
}
$mimetype = rcmail_fix_mimetype($attach_prop->mimetype);