commit d41f2472b3c45b3fbaaa9e02cc7ac62c4295c575
parent 6f3137cf6ace7001355e75f54f37b6f36b34b446
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Sun, 17 May 2009 13:22:37 -0700
Merge branch 'master' into next
Diffstat:
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/sup/message.rb b/lib/sup/message.rb
@@ -416,7 +416,8 @@ private
# Lowercase the filename because searches are easier that way
@attachments.push filename.downcase unless filename =~ /^sup-attachment-/
add_label :attachment unless filename =~ /^sup-attachment-/
- [Chunk::Attachment.new(m.header.content_type, filename, m, sibling_types)]
+ content_type = m.header.content_type || "application/unknown" # sometimes RubyMail gives us nil
+ [Chunk::Attachment.new(content_type, filename, m, sibling_types)]
## otherwise, it's body text
else