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:
Toshi MARUYAMA 2011-09-26 16:22:38 +00:00
parent 4e488434f7
commit a4c4edacfd
17 changed files with 2 additions and 2 deletions

View File

@ -420,13 +420,13 @@ class Mailer < ActionMailer::Base
def render_multipart(method_name, body)
if Setting.plain_text_mail?
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')
else
content_type "multipart/alternative"
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')
part :content_type => "text/html",
:body => render_message("#{method_name}.text.html.rhtml", body)