Fix bad merge

2026-01-27 23:38:11 -05:00 · 2008-07-14 11:50:07 -07:00
parent cdf0f1aa2e
commit 4e323f6ef0
1 changed files with 2 additions and 2 deletions
--- a/actionpack/lib/action_view/template_handlers/compilable.rb
+++ b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -12,8 +12,8 @@ module ActionView
        end
      end

-      def render(template)
-        @view.send(:execute, template)
+      def render(template, local_assigns = {})
+        @view.send(:execute, template, local_assigns)
      end

      # Compile and evaluate the template's code