diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-30 05:05:19 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-03-30 05:05:19 +0000 |
| commit | 316906cbbb529839c2ffa3f37a010193f7722352 (patch) | |
| tree | f25c83181472760bcd8c21981bc37eb6b9fa2cb0 /actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb | |
| parent | f66bbf5ed0504a1514a16f0802e3455655b609b5 (diff) | |
| download | rails-316906cbbb529839c2ffa3f37a010193f7722352.tar.gz rails-316906cbbb529839c2ffa3f37a010193f7722352.tar.bz2 rails-316906cbbb529839c2ffa3f37a010193f7722352.zip | |
Merge in latest tmail trunk r241
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@9144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb index a8b8017cf9..5dc5efae5e 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail-1.2.2/tmail/attachments.rb @@ -1,6 +1,6 @@ =begin rdoc -= Attachment handling class += Attachment handling file =end @@ -17,8 +17,7 @@ module TMail end def attachment?(part) - (part['content-disposition'] && part['content-disposition'].disposition == "attachment") || - part.header['content-type'].main_type != "text" + part.disposition_is_attachment? || part.content_type_is_text? end def attachments |