github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-29 00:08:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Ruby 1.9: Call join on template_root instead of to_s

Browse Source
This commit is contained in:
Joshua Peek
2008-07-19 12:23:08 -05:00
parent e0d7bace4e
commit 7461227352
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
actionmailer/lib/action_mailer/base.rb
View File

@@ -529,7 +529,7 @@ module ActionMailer #:nodoc:
end end
def render_message(method_name, body) def render_message(method_name, body)
render :file => method_name, :body => body, :use_full_path => true render :file => method_name, :body => body
end end
def render(opts) def render(opts)
@@ -537,12 +537,11 @@ module ActionMailer #:nodoc:
if opts[:file] && opts[:file] !~ /\// if opts[:file] && opts[:file] !~ /\//
opts[:file] = "#{mailer_name}/#{opts[:file]}" opts[:file] = "#{mailer_name}/#{opts[:file]}"
end end
opts[:use_full_path] = true
initialize_template_class(body).render(opts) initialize_template_class(body).render(opts)
end end
def template_path def template_path
"#{template_root}/#{mailer_name}" "#{template_root.join}/#{mailer_name}"
end end
def initialize_template_class(assigns) def initialize_template_class(assigns)