From b30ac2f645f8e71758f9c12aed97f806f121396f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Lang Date: Sun, 9 Dec 2007 21:55:21 +0000 Subject: [PATCH] Fixed Mailer#render_message to be Rails 2.0 compatible. git-svn-id: http://redmine.rubyforge.org/svn/branches/work@968 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- rails-2.0/app/models/mailer.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rails-2.0/app/models/mailer.rb b/rails-2.0/app/models/mailer.rb index 9639e1a9c..d85395981 100644 --- a/rails-2.0/app/models/mailer.rb +++ b/rails-2.0/app/models/mailer.rb @@ -150,6 +150,6 @@ class Mailer < ActionMailer::Base def render_message(method_name, body) layout = method_name.match(%r{text\.html\.(rhtml|rxml)}) ? 'layout.text.html.rhtml' : 'layout.text.plain.rhtml' body[:content_for_layout] = render(:file => method_name, :body => body) - ActionView::Base.new(File.join(template_root, 'mailer'), body, self).render(:file => layout) + ActionView::Base.new(template_root, body, self).render(:file => "mailer/#{layout}") end end