Permalink
Browse files

Fix bad merge

  • Loading branch information...
jeremy committed Jul 14, 2008
1 parent cdf0f1a commit 4e323f6ef09fed146a9302d7b7e3f09934de6e37
Showing with 2 additions and 2 deletions.
  1. +2 −2 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

0 comments on commit 4e323f6

Please sign in to comment.