diff options
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 4247e8a1cf..c7f3420a6e 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -208,6 +208,7 @@ module ActionController #:nodoc: template_with_options = options.is_a?(Hash) if apply_layout?(template_with_options, options) && (layout = pick_layout(template_with_options, options, deprecated_layout)) + options = options.merge :layout => false if template_with_options logger.info("Rendering #{options} within #{layout}") if logger if template_with_options @@ -266,4 +267,4 @@ module ActionController #:nodoc: end end end -end
\ No newline at end of file +end |