aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer/lib
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-19 12:35:42 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-19 12:35:42 -0500
commite23156e87bd32206a5ea529fbecc04fdf37d7bc2 (patch)
tree5d6bcfdd991eb5e98e89f29e0f9637c86652903d /actionmailer/lib
parent746122735269b9077c7d5d99d88e8b22d88ad8d5 (diff)
downloadrails-e23156e87bd32206a5ea529fbecc04fdf37d7bc2.tar.gz
rails-e23156e87bd32206a5ea529fbecc04fdf37d7bc2.tar.bz2
rails-e23156e87bd32206a5ea529fbecc04fdf37d7bc2.zip
Only create a path for ActionMailer template root instead of a path set. Better fix than 7461227
Diffstat (limited to 'actionmailer/lib')
-rw-r--r--actionmailer/lib/action_mailer/base.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index e4920f0c86..bf60e2f3d5 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,7 +426,7 @@ module ActionMailer #:nodoc:
end
def template_root=(root)
- write_inheritable_attribute(:template_root, ActionView::PathSet.new(Array(root)))
+ write_inheritable_attribute(:template_root, ActionView::PathSet::Path.new(root))
end
end
@@ -541,7 +541,7 @@ module ActionMailer #:nodoc:
end
def template_path
- "#{template_root.join}/#{mailer_name}"
+ "#{template_root}/#{mailer_name}"
end
def initialize_template_class(assigns)