diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-24 12:15:45 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-24 12:15:45 +0000 |
| commit | 3b4eb7aece771cb0cce131e55dbdc8137a118512 (patch) | |
| tree | 17a9eea794e228d82d53902d5c8d8cdaaf67223f /actionmailer/lib | |
| parent | 0d8455c1a285c6d58fc7a3180f5c72d9c3c42fa1 (diff) | |
| download | rails-3b4eb7aece771cb0cce131e55dbdc8137a118512.tar.gz rails-3b4eb7aece771cb0cce131e55dbdc8137a118512.tar.bz2 rails-3b4eb7aece771cb0cce131e55dbdc8137a118512.zip | |
Allow specific "multipart/xxx" content-type to be set on multipart messages #1412 [Flurin Egger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1493 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 7154dbdc93..a8880146af 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -278,6 +278,8 @@ module ActionMailer #:nodoc: part = (TMail::Mail === p ? p : p.to_mail(self)) m.parts << part end + + m.set_content_type(content_type, nil, { "charset" => charset }) if content_type =~ /multipart/ end @mail = m |