diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-08-22 20:43:43 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-08-22 20:43:43 +0000 |
| commit | b13efaf9855d5dc060972dae11ef97ab28c93e44 (patch) | |
| tree | 4c3a9573f1e8d0c622a061698022fcc22b7cf353 /actionmailer/lib | |
| parent | 82f44f314402cbd4627caa1c8ba24c35a5c875dd (diff) | |
| download | rails-b13efaf9855d5dc060972dae11ef97ab28c93e44.tar.gz rails-b13efaf9855d5dc060972dae11ef97ab28c93e44.tar.bz2 rails-b13efaf9855d5dc060972dae11ef97ab28c93e44.zip | |
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
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/attachments.rb | 4 |
1 files changed, 3 insertions, 1 deletions
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? |