From f9a4774e0e5c34c31cd2fb726dd0f9b6694b4b1b Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Thu, 22 Feb 2007 19:04:00 +0000 Subject: Make sure parsed emails recognize attachments nested in multpart parts (closes #6714) git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6207 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/vendor/tmail/attachments.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'actionmailer/lib/action_mailer') diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb index 4d8d106ad8..7961b03ac5 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb @@ -18,7 +18,9 @@ module TMail def attachments if multipart? parts.collect { |part| - if attachment?(part) + if part.multipart? + part.attachments + elsif attachment?(part) content = part.body # unquoted automatically by TMail#body file_name = (part['content-location'] && part['content-location'].body) || @@ -32,7 +34,7 @@ module TMail attachment.content_type = part.content_type attachment end - }.compact + }.flatten.compact end end end -- cgit v1.2.3