diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 17:34:14 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-05 17:34:14 -0700 |
| commit | 9c9da5d927a1401bde9e96879c6117fb22210a09 (patch) | |
| tree | 435d778caaa95416c5f90e3f38efbce47fd8df6c /actionmailer | |
| parent | e7f1556d0e75c635212273cc5e3cfd113456ff29 (diff) | |
| parent | 1dbfe9766e00282c56523f6969550494bbffbbf4 (diff) | |
| download | rails-9c9da5d927a1401bde9e96879c6117fb22210a09.tar.gz rails-9c9da5d927a1401bde9e96879c6117fb22210a09.tar.bz2 rails-9c9da5d927a1401bde9e96879c6117fb22210a09.zip | |
Merge branch 'master' into erbout
Diffstat (limited to 'actionmailer')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index e065132107..51fc6032cc 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -530,7 +530,7 @@ module ActionMailer #:nodoc: end def render_message(method_name, body) - render :file => method_name, :body => body + render :file => method_name, :body => body, :use_full_path => true end def render(opts) @@ -538,6 +538,7 @@ module ActionMailer #:nodoc: if opts[:file] && opts[:file] !~ /\// opts[:file] = "#{mailer_name}/#{opts[:file]}" end + opts[:use_full_path] = true initialize_template_class(body).render(opts) end |