diff options
| author | Joshua Peek <josh@joshpeek.com> | 2008-11-28 11:18:28 -0600 |
|---|---|---|
| committer | Joshua Peek <josh@joshpeek.com> | 2008-11-28 11:18:28 -0600 |
| commit | 9fc23745f1511d8d97433828d9ca87970994d138 (patch) | |
| tree | 83b606852608845853fc5a005949812dfa5160d6 /actionpack/lib/action_controller/base.rb | |
| parent | 5fa0457542b0ff541d0a80ff8c3561eec8e35959 (diff) | |
| download | rails-9fc23745f1511d8d97433828d9ca87970994d138.tar.gz rails-9fc23745f1511d8d97433828d9ca87970994d138.tar.bz2 rails-9fc23745f1511d8d97433828d9ca87970994d138.zip | |
Reinstate "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."
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 |