From b13efaf9855d5dc060972dae11ef97ab28c93e44 Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Mon, 22 Aug 2005 20:43:43 +0000 Subject: Look at content-location header (if available) to determine filename of attachments #1670 git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2034 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/vendor/tmail/attachments.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib') diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb index e402b0545f..cdc4ba8631 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb @@ -15,7 +15,9 @@ module TMail parts.collect { |part| if part.header["content-type"].main_type != "text" content = part.body # unquoted automatically by TMail#body - file_name = part.sub_header("content-type", "name") || + file_name = (part['content-location'] && + part['content-location'].body) || + part.sub_header("content-type", "name") || part.sub_header("content-disposition", "filename") next if file_name.blank? || content.blank? -- cgit v1.2.3