diff options
author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-26 16:22:38 +0000 |
---|---|---|
committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2011-09-26 16:22:38 +0000 |
commit | a4c4edacfdf7665c29115b8707cb2814c11abaaa (patch) | |
tree | a539c1f26b1875ea006beb8ac604f435ca34e6a6 /app/models/mailer.rb | |
parent | 4e488434f74ed5f1d72a64d5b17b6697b4b2f2d6 (diff) | |
download | redmine-a4c4edacfdf7665c29115b8707cb2814c11abaaa.tar.gz redmine-a4c4edacfdf7665c29115b8707cb2814c11abaaa.zip |
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
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r-- | app/models/mailer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb index f62e24d51..591f4e97c 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -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) |