Fix Action View compatibility with jbuilder

jbuilder is doing some weird things such as instantiatign RenderedTemplate with a `Hash` instance as a `body`. So we can't forcibly cast to string in these places.
rails · Oct 21, 2022 · 05919b0 · 05919b0
1 parent b96ddea
commit 05919b0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/actionview/lib/action_view/renderer/abstract_renderer.rb b/actionview/lib/action_view/renderer/abstract_renderer.rb
@@ -142,7 +142,7 @@ class RenderedTemplate # :nodoc:
       attr_reader :body, :template
 
       def initialize(body, template)
-        @body = body.to_s
+        @body = body
         @template = template
       end
 

diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb
@@ -180,7 +180,7 @@ def render(view, locals, buffer = nil, add_to_stack: true, &block)
           view._run(method_name, self, locals, buffer, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block)
           nil
         else
-          view._run(method_name, self, locals, OutputBuffer.new, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block).to_s
+          view._run(method_name, self, locals, OutputBuffer.new, add_to_stack: add_to_stack, has_strict_locals: @strict_locals, &block)&.to_s
         end
       end
     rescue => e