diff options
Diffstat (limited to 'actionpack/lib/action_view/renderer')
| -rw-r--r-- | actionpack/lib/action_view/renderer/abstract_renderer.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_view/renderer/template_renderer.rb | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_view/renderer/abstract_renderer.rb b/actionpack/lib/action_view/renderer/abstract_renderer.rb index 0b5d3785d4..021fb198a9 100644 --- a/actionpack/lib/action_view/renderer/abstract_renderer.rb +++ b/actionpack/lib/action_view/renderer/abstract_renderer.rb @@ -1,6 +1,6 @@ module ActionView class AbstractRenderer #:nodoc: - delegate :find_template, :template_exists?, :with_fallbacks, :update_details, + delegate :find_template, :find_file, :template_exists?, :with_fallbacks, :update_details, :with_layout_format, :formats, :to => :@lookup_context def initialize(lookup_context) diff --git a/actionpack/lib/action_view/renderer/template_renderer.rb b/actionpack/lib/action_view/renderer/template_renderer.rb index a27d5dd1b1..578db362f6 100644 --- a/actionpack/lib/action_view/renderer/template_renderer.rb +++ b/actionpack/lib/action_view/renderer/template_renderer.rb @@ -21,11 +21,12 @@ module ActionView # Determine the template to be rendered using the given options. def determine_template(options) #:nodoc: keys = options[:locals].try(:keys) || [] - if options.key?(:text) Template::Text.new(options[:text], formats.try(:first)) + elsif options.key?(:app_template_file) + find_template(options[:app_template_file], nil, false, keys, @details) elsif options.key?(:file) - with_fallbacks { find_template(options[:file], nil, false, keys, @details) } + with_fallbacks { find_file(options[:file], nil, false, keys, @details) } elsif options.key?(:inline) handler = Template.handler_for_extension(options[:type] || "erb") Template.new(options[:inline], "inline template", handler, :locals => keys) |