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-29 10:45:06 +0100 |
commit | 34905673a3018edeff71aafeceb64e487304d31d (patch) | |
tree | 02264b718d54ffb2a513ad9a05bf2c7a6f572589 /actionpack/lib/action_view/base.rb | |
parent | 6fa9957e0e83f327aaffe34679a5752fc2343fae (diff) | |
download | rails-34905673a3018edeff71aafeceb64e487304d31d.tar.gz rails-34905673a3018edeff71aafeceb64e487304d31d.tar.bz2 rails-34905673a3018edeff71aafeceb64e487304d31d.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_view/base.rb')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index da1f283deb..7697848713 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -322,7 +322,9 @@ module ActionView #:nodoc: end # OPTIMIZE: Checks to lookup template in view path - if template = self.view_paths.find_template(template_file_name, template_format) + if template = self.view_paths["#{template_file_name}.#{template_format}"] + template + elsif template = self.view_paths[template_file_name] 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}"]) |