diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:33 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 18:59:33 +0100 |
| commit | 6fa9957e0e83f327aaffe34679a5752fc2343fae (patch) | |
| tree | 83b606852608845853fc5a005949812dfa5160d6 /actionpack/lib/action_controller/base.rb | |
| parent | f2ee056873b84f8917e72d87181e1a9f5f653342 (diff) | |
| parent | 4d910b033379727e5e7355590c50c72fc75e56db (diff) | |
| download | rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.tar.gz rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.tar.bz2 rails-6fa9957e0e83f327aaffe34679a5752fc2343fae.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 7e38f95076..dca66ff0a5 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -867,8 +867,9 @@ module ActionController #:nodoc: end end - response.layout = layout = pick_layout(options) - logger.info("Rendering template within #{layout}") if logger && layout + layout = pick_layout(options) + response.layout = layout.path_without_format_and_extension if layout + logger.info("Rendering template within #{layout.path_without_format_and_extension}") if logger && layout if content_type = options[:content_type] response.content_type = content_type.to_s |