aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/render/layouts.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-03-12 14:25:10 +0100
committerJosé Valim <jose.valim@gmail.com>2010-03-12 14:25:10 +0100
commit2a12686832fbcf0566454904a5d733998506bf56 (patch)
treeef6da03a35679c59a1673694277f7d34a16fcc92 /actionpack/lib/action_view/render/layouts.rb
parent16846553b8866eab2aa3b128a2a23a221a25f7e3 (diff)
downloadrails-2a12686832fbcf0566454904a5d733998506bf56.tar.gz
rails-2a12686832fbcf0566454904a5d733998506bf56.tar.bz2
rails-2a12686832fbcf0566454904a5d733998506bf56.zip
Allow anything that responds to render to be given as :template and use find_template instead of find in views.
Diffstat (limited to 'actionpack/lib/action_view/render/layouts.rb')
-rw-r--r--actionpack/lib/action_view/render/layouts.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/render/layouts.rb b/actionpack/lib/action_view/render/layouts.rb
index 8688de3d18..91a92a833a 100644
--- a/actionpack/lib/action_view/render/layouts.rb
+++ b/actionpack/lib/action_view/render/layouts.rb
@@ -49,10 +49,10 @@ module ActionView
def _find_layout(layout) #:nodoc:
begin
layout =~ /^\// ?
- with_fallbacks { find(layout) } : find(layout)
+ with_fallbacks { find_template(layout) } : find_template(layout)
rescue ActionView::MissingTemplate => e
update_details(:formats => nil) do
- raise unless exists?(layout)
+ raise unless template_exists?(layout)
end
end
end