Permalink
Browse files

Ruby 1.9: Call join on template_root instead of to_s

  • Loading branch information...
1 parent e0d7bac commit 746122735269b9077c7d5d99d88e8b22d88ad8d5 @josh josh committed Jul 19, 2008
Showing with 2 additions and 3 deletions.
  1. +2 −3 actionmailer/lib/action_mailer/base.rb
View
5 actionmailer/lib/action_mailer/base.rb
@@ -529,20 +529,19 @@ def initialize_defaults(method_name)
end
def render_message(method_name, body)
- render :file => method_name, :body => body, :use_full_path => true
+ render :file => method_name, :body => body
end
def render(opts)
body = opts.delete(:body)
if opts[:file] && opts[:file] !~ /\//
opts[:file] = "#{mailer_name}/#{opts[:file]}"
end
- opts[:use_full_path] = true
initialize_template_class(body).render(opts)
end
def template_path
- "#{template_root}/#{mailer_name}"
+ "#{template_root.join}/#{mailer_name}"
end
def initialize_template_class(assigns)

0 comments on commit 7461227

Please sign in to comment.