Fix bad merge

rails · Jul 14, 2008 · 4e323f6 · 4e323f6
1 parent cdf0f1a
commit 4e323f6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb
@@ -12,8 +12,8 @@ def compilable?
         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