diff options
| author | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-08-07 16:10:17 +0200 |
| commit | dac8927b0576bff89ba3a4fcbf502dffc9b39e89 (patch) | |
| tree | 58c25132a52ef5cc56f406f8e2df416c5f2776a6 /actionmailer/lib/action_mailer/base.rb | |
| parent | 072c87b532a0bfb334787928248863a2561dc849 (diff) | |
| parent | 606e950ccbd02a10f724c73543575a2a4e1ed8cb (diff) | |
| download | rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.gz rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.tar.bz2 rails-dac8927b0576bff89ba3a4fcbf502dffc9b39e89.zip | |
Merge branch 'master' of git://github.com/rails/rails into old
Diffstat (limited to 'actionmailer/lib/action_mailer/base.rb')
| -rw-r--r-- | actionmailer/lib/action_mailer/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionmailer/lib/action_mailer/base.rb b/actionmailer/lib/action_mailer/base.rb index b5a0d0ab96..7b03a7f9ff 100644 --- a/actionmailer/lib/action_mailer/base.rb +++ b/actionmailer/lib/action_mailer/base.rb @@ -566,7 +566,7 @@ module ActionMailer #:nodoc: @template = initialize_template_class(body) layout = _pick_layout(layout, true) unless ActionController::Base.exempt_from_layout.include?(template.handler) - @template._render_template_with_layout(template, layout, {}) + @template._render_template(template, layout, {}) ensure @current_template_content_type = nil end @@ -592,7 +592,7 @@ module ActionMailer #:nodoc: !template || ActionController::Base.exempt_from_layout.include?(template.handler)) if template - @template._render_template_with_layout(template, layout, opts) + @template._render_template(template, layout, opts) elsif inline = opts[:inline] @template._render_inline(inline, layout, opts) end |