diff options
author | José Valim <jose.valim@gmail.com> | 2010-12-27 09:14:13 +0100 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-12-27 09:14:13 +0100 |
commit | 51a7d9acdd4a01fb23e21be7a89e6440e51715e8 (patch) | |
tree | db5d6af054b2a73b353b4412851ccd92393bb750 /actionpack/lib/action_view/renderer | |
parent | e03e1fdbc85bc05536a2770817c31b08d4f6be51 (diff) | |
download | rails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.tar.gz rails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.tar.bz2 rails-51a7d9acdd4a01fb23e21be7a89e6440e51715e8.zip |
Final tidy up on templates inheritance.
Diffstat (limited to 'actionpack/lib/action_view/renderer')
-rw-r--r-- | actionpack/lib/action_view/renderer/partial_renderer.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/partial_renderer.rb b/actionpack/lib/action_view/renderer/partial_renderer.rb index f36b0602b1..3fdea23a4a 100644 --- a/actionpack/lib/action_view/renderer/partial_renderer.rb +++ b/actionpack/lib/action_view/renderer/partial_renderer.rb @@ -111,7 +111,7 @@ module ActionView end def find_template(path=@path, locals=@locals.keys) - prefixes = path.include?(?/) ? [] : @view.controller._prefixes + prefixes = path.include?(?/) ? [] : @view.controller_prefixes @lookup_context.find_template(path, prefixes, true, locals) end diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index 938bb2a3f3..9ae1636131 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -43,7 +43,7 @@ module ActionView if options.key?(:text) Template::Text.new(options[:text], formats.try(:first)) elsif options.key?(:file) - with_fallbacks { find_template(options[:file], [], false, keys) } + with_fallbacks { find_template(options[:file], options[:prefixes], false, keys) } elsif options.key?(:inline) handler = Template.handler_for_extension(options[:type] || "erb") Template.new(options[:inline], "inline template", handler, :locals => keys) |