Rails3: mail: rename app/views/mailer/*.text.plain.rhtml to app/views/mailer/*.text.erb (#6317)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7536 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
4e488434f7
commit
a4c4edacfd
|
@ -420,13 +420,13 @@ class Mailer < ActionMailer::Base
|
||||||
def render_multipart(method_name, body)
|
def render_multipart(method_name, body)
|
||||||
if Setting.plain_text_mail?
|
if Setting.plain_text_mail?
|
||||||
content_type "text/plain"
|
content_type "text/plain"
|
||||||
body render(:file => "#{method_name}.text.plain.rhtml",
|
body render(:file => "#{method_name}.text.erb",
|
||||||
:body => body,
|
:body => body,
|
||||||
:layout => 'mailer.text.erb')
|
:layout => 'mailer.text.erb')
|
||||||
else
|
else
|
||||||
content_type "multipart/alternative"
|
content_type "multipart/alternative"
|
||||||
part :content_type => "text/plain",
|
part :content_type => "text/plain",
|
||||||
:body => render(:file => "#{method_name}.text.plain.rhtml",
|
:body => render(:file => "#{method_name}.text.erb",
|
||||||
:body => body, :layout => 'mailer.text.erb')
|
:body => body, :layout => 'mailer.text.erb')
|
||||||
part :content_type => "text/html",
|
part :content_type => "text/html",
|
||||||
:body => render_message("#{method_name}.text.html.rhtml", body)
|
:body => render_message("#{method_name}.text.html.rhtml", body)
|
||||||
|
|
Loading…
Reference in New Issue