diff options
| author | Yehuda Katz <wycats@gmail.com> | 2009-08-07 03:18:45 -0300 |
|---|---|---|
| committer | Yehuda Katz <wycats@gmail.com> | 2009-08-07 03:18:45 -0300 |
| commit | 0612fd0f09977dece11a0325a0d7ee07c5cab35c (patch) | |
| tree | d225dd3b608eca95a388f61bda4225de75654a79 /actionmailer/lib/action_mailer | |
| parent | b3e199f6981b2fbf062fe668ff93b7dc56e98a38 (diff) | |
| download | rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.gz rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.tar.bz2 rails-0612fd0f09977dece11a0325a0d7ee07c5cab35c.zip | |
Replace _render_template_with_layout with _render_template since the layout is optional
Diffstat (limited to 'actionmailer/lib/action_mailer')
| -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 |