diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-14 11:50:07 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-07-14 11:50:07 -0700 |
| commit | 4e323f6ef09fed146a9302d7b7e3f09934de6e37 (patch) | |
| tree | 38ae0ed9587803daebbe62978284739dbb4f15cd /actionpack/lib | |
| parent | cdf0f1aa2ee4ba73bafc9b9217ee35b7f7eb3273 (diff) | |
| download | rails-4e323f6ef09fed146a9302d7b7e3f09934de6e37.tar.gz rails-4e323f6ef09fed146a9302d7b7e3f09934de6e37.tar.bz2 rails-4e323f6ef09fed146a9302d7b7e3f09934de6e37.zip | |
Fix bad merge
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_view/template_handlers/compilable.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/template_handlers/compilable.rb b/actionpack/lib/action_view/template_handlers/compilable.rb index 2a19fc7628..2b96e7f133 100644 --- 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 |