diff options
| author | Jamis Buck <jamis@37signals.com> | 2005-08-05 20:51:03 +0000 |
|---|---|---|
| committer | Jamis Buck <jamis@37signals.com> | 2005-08-05 20:51:03 +0000 |
| commit | a3469cadadfd770ad9029f651f3a51560bbd3045 (patch) | |
| tree | 3ba4a3b7b046ec8964d2a3dbed77563c15413bce /actionpack/lib | |
| parent | 3d4a32377651a13575ce6da84875af764fdbe339 (diff) | |
| download | rails-a3469cadadfd770ad9029f651f3a51560bbd3045.tar.gz rails-a3469cadadfd770ad9029f651f3a51560bbd3045.tar.bz2 rails-a3469cadadfd770ad9029f651f3a51560bbd3045.zip | |
Make sure :layout => false is always used when rendering inside a layout
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1970 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -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 |