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_view/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_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}"]) |