diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-04-12 17:11:48 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-04-12 17:11:48 +0000 |
| commit | f5b8fc0335d4f5e4e5a3c7d7e4dab14e449403cc (patch) | |
| tree | 415e4de1b7a8cd89dff0b284afb9137661e1c607 /actionpack/lib | |
| parent | d699084f7a050b1aaffe81ce0be84d72e2530eb7 (diff) | |
| download | rails-f5b8fc0335d4f5e4e5a3c7d7e4dab14e449403cc.tar.gz rails-f5b8fc0335d4f5e4e5a3c7d7e4dab14e449403cc.tar.bz2 rails-f5b8fc0335d4f5e4e5a3c7d7e4dab14e449403cc.zip | |
Allow layouts with extension of .html.erb. Closes #8032 [Josh Knowles]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6516 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/layout.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index ca070d0577..7de66cd66e 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -190,7 +190,7 @@ module ActionController #:nodoc: def inherited_with_layout(child) inherited_without_layout(child) layout_match = child.name.underscore.sub(/_controller$/, '').sub(/^controllers\//, '') - child.layout(layout_match) unless child.layout_list.grep(%r{layouts/#{layout_match}\.[a-z][0-9a-z]*$}).empty? + child.layout(layout_match) unless child.layout_list.grep(%r{layouts/#{layout_match}(\.[a-z][0-9a-z]*)+$}).empty? end def add_layout_conditions(conditions) |