Prefer File_Info over mime_content_type + detect mime type when uploading + some code style

1 files changed, 5 insertions, 0 deletions

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 1b1d0bf4b..9da449d54 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -645,12 +645,17 @@ function rcmail_compose_attachment_list($attrib)
       $button = Q(rcube_label('delete'));
 
     foreach ($_SESSION['compose']['attachments'] as $id => $a_prop)
+    {
+      if (empty($a_prop))
+        continue;
+      
       $out .= html::tag('li', array('id' => "rcmfile".$id),
         html::a(array(
             'href' => "#delete",
             'title' => rcube_label('delete'),
             'onclick' => sprintf("return %s.command('remove-attachment','rcmfile%d', this)", JS_OBJECT_NAME, $id)),
           $button) . Q($a_prop['name']));
+    }
   }
 
   $OUTPUT->add_gui_object('attachmentlist', $attrib['id']);