diff options
Diffstat (limited to 'actionmailer/lib/action_mailer/part.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/part.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/part.rb b/actionmailer/lib/action_mailer/part.rb index 9f95df0a16..cb3a3dc053 100644 --- a/actionmailer/lib/action_mailer/part.rb +++ b/actionmailer/lib/action_mailer/part.rb @@ -9,7 +9,7 @@ module ActionMailer adv_attr_accessor :filename, :transfer_encoding, :headers def initialize(params) - @content_type = params[:content_type] || "text/plain" + @content_type = params[:content_type] @content_disposition = params[:disposition] || "inline" @charset = params[:charset] @body = params[:body] @@ -20,7 +20,7 @@ module ActionMailer def to_mail(defaults) part = TMail::Mail.new - part.set_content_type(content_type, nil, + part.set_content_type(content_type || defaults.content_type, nil, "charset" => (content_disposition == "attachment" ? nil : (charset || defaults.charset)), "name" => filename) |