diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-12-05 10:33:50 +0100 |
| commit | 48386d245bc169d3a36e5f305927bd968b108fea (patch) | |
| tree | 9156d3535c42e7f56af6e69fbbd5164ccb4fcc95 /actionpack/lib/abstract_controller/layouts.rb | |
| parent | b696dd70db651c6cb4a096dd0d5762416acd9917 (diff) | |
| parent | e1d0d5ae81d2b02eebb1afbfb79edf0a2da2d48e (diff) | |
| download | rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.gz rails-48386d245bc169d3a36e5f305927bd968b108fea.tar.bz2 rails-48386d245bc169d3a36e5f305927bd968b108fea.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/abstract_controller/layouts.rb')
| -rw-r--r-- | actionpack/lib/abstract_controller/layouts.rb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb index b68c7d9216..606f7eedec 100644 --- a/actionpack/lib/abstract_controller/layouts.rb +++ b/actionpack/lib/abstract_controller/layouts.rb @@ -235,13 +235,10 @@ module AbstractController controller_path end - # Takes the specified layout and creates a _layout method to be called - # by _default_layout + # Creates a _layout method to be called by _default_layout . # - # If there is no explicit layout specified: - # If a layout is found in the view paths with the controller's - # name, return that string. Otherwise, use the superclass' - # layout (which might also be implied) + # If a layout is not explicitly mentioned then look for a layout with the controller's name. + # if nothing is found then try same procedure to find super class's layout. def _write_layout_method remove_possible_method(:_layout) |