diff options
author | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-14 18:07:20 +0000 |
---|---|---|
committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-12-14 18:07:20 +0000 |
commit | 78727dd8e226f16fd2446db0bcaf41e127ba9bc8 (patch) | |
tree | 9aa8943dbe7fddcbdbc38c78362737bae910df58 /actionpack/lib/action_view | |
parent | 7a224356a88f104b6bf012e930721efb2274c2b1 (diff) | |
download | rails-78727dd8e226f16fd2446db0bcaf41e127ba9bc8.tar.gz rails-78727dd8e226f16fd2446db0bcaf41e127ba9bc8.tar.bz2 rails-78727dd8e226f16fd2446db0bcaf41e127ba9bc8.zip |
Fixed that ActionView#file_exists? would be incorrect if @first_render is set (closes #10569) [dbussink]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8385 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view')
-rw-r--r-- | actionpack/lib/action_view/base.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index ee10d8cb0a..5b34b855e1 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -404,7 +404,7 @@ If you are rendering a subtemplate, you must now use controller-like partial syn if template_file_extension template_exists?(template_file_name, template_file_extension) else - pick_template_extension(template_path) + template_exists?(template_file_name, pick_template_extension(template_path)) end end |