summaryrefslogtreecommitdiffstats
path: root/app/models/mailer.rb
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-26 16:20:57 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-09-26 16:20:57 +0000
commitc534c9e984d3170110116c0dcafebf3688d7d0b4 (patch)
tree8f7e952042db415efddde06ad865f3643d67a0d0 /app/models/mailer.rb
parent9c650540baa026da37af7316fa14662d61ce70ec (diff)
downloadredmine-c534c9e984d3170110116c0dcafebf3688d7d0b4.tar.gz
redmine-c534c9e984d3170110116c0dcafebf3688d7d0b4.zip
Rails3: mail: rename app/views/layouts/mailer.text.plain.erb to app/views/layouts/mailer.text.erb (#6317)
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7534 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/models/mailer.rb')
-rw-r--r--app/models/mailer.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index d0ee4b0b5..f62e24d51 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -422,12 +422,12 @@ class Mailer < ActionMailer::Base
content_type "text/plain"
body render(:file => "#{method_name}.text.plain.rhtml",
:body => body,
- :layout => 'mailer.text.plain.erb')
+ :layout => 'mailer.text.erb')
else
content_type "multipart/alternative"
part :content_type => "text/plain",
:body => render(:file => "#{method_name}.text.plain.rhtml",
- :body => body, :layout => 'mailer.text.plain.erb')
+ :body => body, :layout => 'mailer.text.erb')
part :content_type => "text/html",
:body => render_message("#{method_name}.text.html.rhtml", body)
end