diff options
author | Marcel Molina <marcel@vernix.org> | 2008-02-08 22:04:06 +0000 |
---|---|---|
committer | Marcel Molina <marcel@vernix.org> | 2008-02-08 22:04:06 +0000 |
commit | c848c4c6217d825514fe96b37c17ac446a9cd779 (patch) | |
tree | ac03c2b65af69d0d13cda5997960ecc5b0c1646b /actionpack/lib | |
parent | 218417b8a93f3c13c9328669db2a1baa60c53562 (diff) | |
download | rails-c848c4c6217d825514fe96b37c17ac446a9cd779.tar.gz rails-c848c4c6217d825514fe96b37c17ac446a9cd779.tar.bz2 rails-c848c4c6217d825514fe96b37c17ac446a9cd779.zip |
Fix problem with render :partial collections, records, and locals. #11057 [lotswholetime]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8822 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib')
-rw-r--r-- | actionpack/lib/action_view/partials.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb index a945e9907d..e2aa98a319 100644 --- a/actionpack/lib/action_view/partials.rb +++ b/actionpack/lib/action_view/partials.rb @@ -127,14 +127,14 @@ module ActionView if partial_path.any? path = ActionController::RecordIdentifier.partial_path(partial_path.first) collection = partial_path - render_partial_collection(path, collection, nil, object_assigns.value) + render_partial_collection(path, collection, nil, local_assigns) else "" end else render_partial( ActionController::RecordIdentifier.partial_path(partial_path), - object_assigns, local_assigns) + partial_path, local_assigns) end end |