Skip to content
This repository
Browse code

Ruby 1.9: Call join on template_root instead of to_s

  • Loading branch information...
commit 746122735269b9077c7d5d99d88e8b22d88ad8d5 1 parent e0d7bac
Joshua Peek josh authored

Showing 1 changed file with 2 additions and 3 deletions. Show diff stats Hide diff stats

  1. +2 3 actionmailer/lib/action_mailer/base.rb
5 actionmailer/lib/action_mailer/base.rb
@@ -529,7 +529,7 @@ def initialize_defaults(method_name)
529 529 end
530 530
531 531 def render_message(method_name, body)
532   - render :file => method_name, :body => body, :use_full_path => true
  532 + render :file => method_name, :body => body
533 533 end
534 534
535 535 def render(opts)
@@ -537,12 +537,11 @@ def render(opts)
537 537 if opts[:file] && opts[:file] !~ /\//
538 538 opts[:file] = "#{mailer_name}/#{opts[:file]}"
539 539 end
540   - opts[:use_full_path] = true
541 540 initialize_template_class(body).render(opts)
542 541 end
543 542
544 543 def template_path
545   - "#{template_root}/#{mailer_name}"
  544 + "#{template_root.join}/#{mailer_name}"
546 545 end
547 546
548 547 def initialize_template_class(assigns)

0 comments on commit 7461227

Please sign in to comment.
Something went wrong with that request. Please try again.