diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/steps/mail/attachments.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/compose.inc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/program/steps/mail/attachments.inc b/program/steps/mail/attachments.inc index 81ac2fe5c..7cd089e04 100644 --- a/program/steps/mail/attachments.inc +++ b/program/steps/mail/attachments.inc @@ -91,7 +91,7 @@ if (is_array($_FILES['_attachments']['tmp_name'])) { unset($attachment['status']); $_SESSION['compose']['attachments'][$id] = $attachment; - if (is_file($icon = $CONFIG['skin_path'] . '/images/icons/remove-attachment.png')) { + if (($icon = $_SESSION['compose']['deleteicon']) && is_file($icon)) { $button = html::img(array( 'src' => $icon, 'alt' => rcube_label('delete') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 8d43de050..f753b35dd 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -716,11 +716,13 @@ function rcmail_compose_attachment_list($attrib) if (is_array($_SESSION['compose']['attachments'])) { - if ($attrib['deleteicon']) + if ($attrib['deleteicon']) { $button = html::img(array( 'src' => $CONFIG['skin_path'] . $attrib['deleteicon'], 'alt' => rcube_label('delete') - )); + )); + $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon']; + } else $button = Q(rcube_label('delete')); |