diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-06-22 10:12:06 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-06-22 10:12:06 +0000 |
| commit | 053cb22c17b42bdd4bf60a96fbe73df332430556 (patch) | |
| tree | a6873716f4481d5015a234e44cabb5599b175162 /actionmailer/lib/action_mailer | |
| parent | 2694b8cf276b52644495dc678436a10d9f8cee6d (diff) | |
| download | rails-053cb22c17b42bdd4bf60a96fbe73df332430556.tar.gz rails-053cb22c17b42bdd4bf60a96fbe73df332430556.tar.bz2 rails-053cb22c17b42bdd4bf60a96fbe73df332430556.zip | |
Use the real charset for parts generated by a template, instead of the string "charset".
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1478 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 20911513d0..7154dbdc93 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -178,7 +178,7 @@ module ActionMailer #:nodoc: type = (File.basename(path).split(".")[1..-2] || []).join("/") next if type.empty? @parts << Part.new(:content_type => type, - :disposition => "inline", :charset => "charset", + :disposition => "inline", :charset => charset, :body => render_message(File.basename(path).split(".")[0..-2].join('.'), @body)) end end |