diff options
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 931b4c4e6d..055da8e7ef 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Correct docs for automatic layout assignment. #2610. [Charles M. Gerungan] + * Always create new AR sessions rather than trying too hard to avoid database traffic. #2731 [Jeremy Kemper] * Update to Prototype 1.4.0_rc4. Closes #2943 (old Array.prototype.reverse behavior can be obtained by passing false as an argument). [Sam Stephenson] diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index caf29ea113..d6a4789bef 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -66,7 +66,9 @@ module ActionController #:nodoc: # <tt>app/views/layouts/weblog.rhtml</tt> or <tt>app/views/layouts/weblog.rxml</tt> exists then it will be automatically set as # the layout for your WeblogController. You can create a layout with the name <tt>application.rhtml</tt> or <tt>application.rxml</tt> # and this will be set as the default controller if there is no layout with the same name as the current controller and there is - # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour. + # no layout explicitly assigned with the +layout+ method. Setting a layout explicitly will always override the automatic behaviour + # for the controller where the layout is set. Explicitly setting the layout in a parent class, though, will not override the + # child class's layout assignement if the child class has a layout with the same name. # # == Inheritance for layouts # |