Only include attachments that arent blank

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@918 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 8 insertions, 2 deletions

diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb
index fb6629d67e..52455e5d2d 100644
--- a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb
+++ b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb
@@ -14,8 +14,14 @@ module TMail
       if multipart?
         parts.collect { |part| 
           if part.header["content-type"].main_type != "text"
-            attachment = Attachment.new(Base64.decode64(part.body))
-            attachment.original_filename = part.header["content-type"].params["name"].strip.dup
+            content   = part.body.unpack("m")[0]
+            content   = part.body if content.blank?
+            file_name = part.header["content-type"].params["name"]
+            
+            next if file_name.blank? || content.blank?
+            
+            attachment = Attachment.new(content)
+            attachment.original_filename = file_name.strip.dup
             attachment
           end
         }.compact