diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 21:04:24 +0100 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2008-11-27 21:04:24 +0100 |
| commit | 5fa0457542b0ff541d0a80ff8c3561eec8e35959 (patch) | |
| tree | 02264b718d54ffb2a513ad9a05bf2c7a6f572589 /actionpack/lib/action_controller/base.rb | |
| parent | 6fa9957e0e83f327aaffe34679a5752fc2343fae (diff) | |
| download | rails-5fa0457542b0ff541d0a80ff8c3561eec8e35959.tar.gz rails-5fa0457542b0ff541d0a80ff8c3561eec8e35959.tar.bz2 rails-5fa0457542b0ff541d0a80ff8c3561eec8e35959.zip | |
Revert "Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading.
This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
Diffstat (limited to 'actionpack/lib/action_controller/base.rb')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index dca66ff0a5..7e38f95076 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -867,9 +867,8 @@ module ActionController #:nodoc: end end - 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 + response.layout = layout = pick_layout(options) + logger.info("Rendering template within #{layout}") if logger && layout if content_type = options[:content_type] response.content_type = content_type.to_s |