summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2009-05-29 09:37:32 +0000
committerthomascube <thomas@roundcube.net>2009-05-29 09:37:32 +0000
commit991a25ab5df66752d8bdb460d1b622b9f52358b1 (patch)
treebc42d3fab3f98239048358b83ff14f8078cb6c5f /program
parentbb7509c60745636ffea891bb05c7766879db6a0b (diff)
Better icon for deleting folders + remove hard-coded icon path
Diffstat (limited to 'program')
-rw-r--r--program/steps/mail/attachments.inc2
-rw-r--r--program/steps/mail/compose.inc6
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'));