diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-08-08 21:21:04 +0000 |
| commit | 74165eb6acaca98d4da13409c4e5b5ecc9d260f7 (patch) | |
| tree | 024158d20563f34cca52a00b42aaa6c922777559 /actionpack/lib/action_controller/layout.rb | |
| parent | 94a1309194fa5962e33d395ede14e94b237c54f5 (diff) | |
| download | rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.gz rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.tar.bz2 rails-74165eb6acaca98d4da13409c4e5b5ecc9d260f7.zip | |
New dependencies implementation
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4728 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/layout.rb')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 91ca16913e..338d5980ab 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -183,7 +183,6 @@ module ActionController #:nodoc: private def inherited_with_layout(child) inherited_without_layout(child) - child.send :include, Reloadable layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '') child.layout(layout_match) unless layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty? end |