From 2626f847a48e842dda46d4f837b480a92a8d713c Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 15 Jun 2009 18:43:20 +0000
Subject: - fix delete icon on attachment list (#1485921)

git-svn-id: https://svn.roundcube.net/trunk@2646 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/compose.inc       | 4 +++-
 roundcubemail/skins/default/templates/compose.html | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index fbd0cc44d..3c82c8e03 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -725,7 +725,6 @@ function rcmail_compose_attachment_list($attrib)
         'src' => $CONFIG['skin_path'] . $attrib['deleteicon'],
         'alt' => rcube_label('delete')
       ));
-      $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
     }
     else
       $button = Q(rcube_label('delete'));
@@ -744,6 +743,9 @@ function rcmail_compose_attachment_list($attrib)
     }
   }
 
+  if ($attrib['deleteicon'])
+    $_SESSION['compose']['deleteicon'] = $CONFIG['skin_path'] . $attrib['deleteicon'];
+
   $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);
     
   return html::tag('ul', $attrib, $out, html::$common_attrib);
diff --git a/roundcubemail/skins/default/templates/compose.html b/roundcubemail/skins/default/templates/compose.html
index 3225b2895..0e122edeb 100644
--- a/roundcubemail/skins/default/templates/compose.html
+++ b/roundcubemail/skins/default/templates/compose.html
@@ -93,7 +93,7 @@
 
 <div id="compose-attachments">
 <div id="attachment-title"><roundcube:label name="attachments" /></div>
-<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png"/ >
+<roundcube:object name="composeAttachmentList" deleteIcon="/images/icons/delete.png" />
 <p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" /></p>
 </div>
 
-- 
cgit v1.2.3