diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-10 15:30:18 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-05-10 15:30:18 +0000 |
| commit | ee6882614f46c33277c36504d125672bb8f6c34e (patch) | |
| tree | b4ea625cf335a5ac98f015410657e5ba6a5c82e8 /actionmailer/lib/action_mailer/vendor/tmail/attachments.rb | |
| parent | 9c9286710268ff124ffe68727030dbe401bbc3c2 (diff) | |
| download | rails-ee6882614f46c33277c36504d125672bb8f6c34e.tar.gz rails-ee6882614f46c33277c36504d125672bb8f6c34e.tar.bz2 rails-ee6882614f46c33277c36504d125672bb8f6c34e.zip | |
Step cautiously around subheaders in TMail #1285 [Jamis Buck]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1301 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer/vendor/tmail/attachments.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/vendor/tmail/attachments.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb index e78d2f91d2..e402b0545f 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/attachments.rb @@ -15,8 +15,8 @@ module TMail parts.collect { |part| if part.header["content-type"].main_type != "text" content = part.body # unquoted automatically by TMail#body - file_name = part.header["content-type"].params["name"] || - part.header["content-disposition"].params["filename"] + file_name = part.sub_header("content-type", "name") || + part.sub_header("content-disposition", "filename") next if file_name.blank? || content.blank? |