diff options
| author | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-28 00:24:30 +1100 |
|---|---|---|
| committer | Mikel Lindsaar <raasdnil@gmail.com> | 2010-01-28 00:24:30 +1100 |
| commit | b6b3db6734af8d5b42c7bdcea7c73923a5b88463 (patch) | |
| tree | 87ea66957fcf45af72f5494e9ea8dd06343d8184 /actionmailer/lib | |
| parent | f3caa63bcbbfff093efcdfa3547fb2eb96479f0a (diff) | |
| download | rails-b6b3db6734af8d5b42c7bdcea7c73923a5b88463.tar.gz rails-b6b3db6734af8d5b42c7bdcea7c73923a5b88463.tar.bz2 rails-b6b3db6734af8d5b42c7bdcea7c73923a5b88463.zip | |
Fixed bug on HTML only emails getting set to text/plain
Diffstat (limited to 'actionmailer/lib')
| -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 2288a30691..3fbf004a0d 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -531,7 +531,7 @@ module ActionMailer #:nodoc: when m.multipart? ["multipart", "alternative", params] else - class_default + m.content_type || class_default end end |