diff options
| author | Jamis Buck <jamis@37signals.com> | 2006-01-23 16:48:24 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2006-01-23 16:48:24 +0000 |
| commit | 185cca238bc1df79a3bb438679bbbeb980f82078 (patch) | |
| tree | ee8bcd6e0585e77e1028cd675baba51438300a98 /actionmailer/lib | |
| parent | acfb8b6191338cdb04707e2e1e8ac1cdbb595b4f (diff) | |
| download | rails-185cca238bc1df79a3bb438679bbbeb980f82078.tar.gz rails-185cca238bc1df79a3bb438679bbbeb980f82078.tar.bz2 rails-185cca238bc1df79a3bb438679bbbeb980f82078.zip | |
Make sure anything with content-disposition of "attachment" is passed to the attachment presenter when parsing an email body
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index 36bf03f0a3..a56e2267ee 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -33,7 +33,7 @@ module TMail part.body(to_charset, &attachment_presenter) elsif header.nil? "" - elsif header.main_type == "text" + elsif !attachment?(part) part.unquoted_body(to_charset) else attachment_presenter.call(header["name"] || "(unnamed)") |