From c534c9e984d3170110116c0dcafebf3688d7d0b4 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 26 Sep 2011 16:20:57 +0000 Subject: [PATCH] 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 --- app/models/mailer.rb | 4 ++-- app/views/layouts/{mailer.text.plain.erb => mailer.text.erb} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename app/views/layouts/{mailer.text.plain.erb => mailer.text.erb} (100%) 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 diff --git a/app/views/layouts/mailer.text.plain.erb b/app/views/layouts/mailer.text.erb similarity index 100% rename from app/views/layouts/mailer.text.plain.erb rename to app/views/layouts/mailer.text.erb