diff options
| author | Sean Dague <sean@dague.net> | 2009-03-10 16:23:52 +0000 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-03-10 16:38:37 +0000 |
| commit | 1dff106888d671dac07f93711ecb319170132c56 (patch) | |
| tree | 924940ee613819bd46e020651663752e64e4cfa4 /actionmailer/lib/action_mailer | |
| parent | e8b07dc340441d4d15889cb14ee9f0f00a1ecd30 (diff) | |
| download | rails-1dff106888d671dac07f93711ecb319170132c56.tar.gz rails-1dff106888d671dac07f93711ecb319170132c56.tar.bz2 rails-1dff106888d671dac07f93711ecb319170132c56.zip | |
Allow custom type for multipart emails [#1691 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
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 db4589ee8f..b77409b64b 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -479,7 +479,7 @@ module ActionMailer #:nodoc: ) end unless @parts.empty? - @content_type = "multipart/alternative" + @content_type = "multipart/alternative" if @content_type !~ /^multipart/ @parts = sort_parts(@parts, @implicit_parts_order) end end |