diff options
| author | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
|---|---|---|
| committer | rick <technoweenie@gmail.com> | 2008-07-16 14:20:15 -0700 |
| commit | 0a6d75dedd79407376aae1f01302164dfd3e44b6 (patch) | |
| tree | dfef7e73b3b19a65895651c82cb6e0b727394eab /actionmailer/lib | |
| parent | a14cedc7797aef4ccd9da46ed73e36d730392814 (diff) | |
| parent | fc89a951933638b051bb1f9e1339ee6ae7c94cda (diff) | |
| download | rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.gz rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.tar.bz2 rails-0a6d75dedd79407376aae1f01302164dfd3e44b6.zip | |
merge with local tweaks
Diffstat (limited to 'actionmailer/lib')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index 1518e23dfe..5a71935009 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::ViewLoadPaths.new(Array(root))) + write_inheritable_attribute(:template_root, ActionView::PathSet.new(Array(root))) end end |