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_view/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_view/base.rb')
| -rw-r--r-- | actionpack/lib/action_view/base.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 7697848713..da1f283deb 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -322,9 +322,7 @@ module ActionView #:nodoc: end # OPTIMIZE: Checks to lookup template in view path - if template = self.view_paths["#{template_file_name}.#{template_format}"] - template - elsif template = self.view_paths[template_file_name] + if template = self.view_paths.find_template(template_file_name, template_format) template elsif (first_render = @_render_stack.first) && first_render.respond_to?(:format_and_extension) && (template = self.view_paths["#{template_file_name}.#{first_render.format_and_extension}"]) |