From 60d6f255177af3ca93721abb8551c8585fc8c67d Mon Sep 17 00:00:00 2001 From: Luke Melia Date: Tue, 18 Nov 2008 15:16:43 -0600 Subject: Fix rendering html partial via inline render when with :js format [#1399 state:resolved] Signed-off-by: Joshua Peek --- actionpack/lib/action_view/base.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'actionpack/lib/action_view') diff --git a/actionpack/lib/action_view/base.rb b/actionpack/lib/action_view/base.rb index 945246a39a..511858dd9b 100644 --- a/actionpack/lib/action_view/base.rb +++ b/actionpack/lib/action_view/base.rb @@ -317,7 +317,8 @@ module ActionView #:nodoc: template elsif template = self.view_paths[template_file_name] template - elsif @_render_stack.first && template = self.view_paths["#{template_file_name}.#{@_render_stack.first.format_and_extension}"] + elsif (first_render = @_render_stack.first) && first_render.respond_to?(:format_and_extension) && + (template = self.view_paths["#{template_file_name}.#{first_render.format_and_extension}"]) template elsif template_format == :js && template = self.view_paths["#{template_file_name}.html"] @template_format = :html -- cgit v1.2.3