diff options
| author | artemave <artemave@gmail.com> | 2010-09-17 20:39:14 +0000 |
|---|---|---|
| committer | wycats <wycats@gmail.com> | 2010-12-26 22:32:15 -0800 |
| commit | ddd85ef9c6a6297a8ff28816d907bbbf2eae5856 (patch) | |
| tree | b2ff8ede17f042e8e007c6103b4063ce7ac75383 /actionpack/lib/action_view/renderer/template_renderer.rb | |
| parent | 9bac649fa4ca6f05795e7cab8d30049aa2410cb8 (diff) | |
| download | rails-ddd85ef9c6a6297a8ff28816d907bbbf2eae5856.tar.gz rails-ddd85ef9c6a6297a8ff28816d907bbbf2eae5856.tar.bz2 rails-ddd85ef9c6a6297a8ff28816d907bbbf2eae5856.zip | |
#948 template_inheritance
Diffstat (limited to 'actionpack/lib/action_view/renderer/template_renderer.rb')
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index ece3f621b6..4a0bc503d3 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -43,13 +43,13 @@ module ActionView if options.key?(:text) Template::Text.new(options[:text], formats.try(:first)) elsif options.key?(:file) - with_fallbacks { find_template(options[:file], options[:prefix], false, keys) } + with_fallbacks { find_template(options[:file], [], false, keys) } elsif options.key?(:inline) handler = Template.handler_for_extension(options[:type] || "erb") Template.new(options[:inline], "inline template", handler, :locals => keys) elsif options.key?(:template) options[:template].respond_to?(:render) ? - options[:template] : find_template(options[:template], options[:prefix], false, keys) + options[:template] : find_template(options[:template], options[:prefixes], false, keys) end end |