aboutsummaryrefslogtreecommitdiffstats
path: root/actionmailer
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-07-19 15:27:55 -0500
committerJoshua Peek <josh@joshpeek.com>2008-07-19 15:27:55 -0500
commit55bfe6be52da1130abb1c148f10d8e9a11368ffd (patch)
tree34b0e675b2fb772326f99488435d5bdc48e31c12 /actionmailer
parent1b4b1aa725a4f44c3473ae99b36d7cededba2bea (diff)
downloadrails-55bfe6be52da1130abb1c148f10d8e9a11368ffd.tar.gz
rails-55bfe6be52da1130abb1c148f10d8e9a11368ffd.tar.bz2
rails-55bfe6be52da1130abb1c148f10d8e9a11368ffd.zip
Ensure ActionView::PathSet::Path is not initialized with a precompiled path
Diffstat (limited to 'actionmailer')
-rw-r--r--actionmailer/lib/action_mailer/base.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb
index bf60e2f3d5..a43296461b 100644
--- a/actionmailer/lib/action_mailer/base.rb
+++ b/actionmailer/lib/action_mailer/base.rb
@@ -426,7 +426,8 @@ module ActionMailer #:nodoc:
end
def template_root=(root)
- write_inheritable_attribute(:template_root, ActionView::PathSet::Path.new(root))
+ root = ActionView::PathSet::Path.new(root) if root.is_a?(String)
+ write_inheritable_attribute(:template_root, root)
end
end