aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/partials.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-09-09 07:27:44 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-09-09 07:27:44 +0000
commite3c02d8c66ae3df7a58ba7d76dfc464f26dcff67 (patch)
treebb21f2713880c9f8841094e2fcf270fb5c69596d /actionpack/lib/action_view/partials.rb
parent46110aa689412816d077b1f248a6cdb4d9552eda (diff)
downloadrails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.tar.gz
rails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.tar.bz2
rails-e3c02d8c66ae3df7a58ba7d76dfc464f26dcff67.zip
Fixed that render :partial would fail when :object was a Hash (due to backwards compatibility issues) #2148 [Sam Stephenson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2160 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_view/partials.rb')
-rw-r--r--actionpack/lib/action_view/partials.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb
index e1dcd4ee9d..5a129f12ab 100644
--- a/actionpack/lib/action_view/partials.rb
+++ b/actionpack/lib/action_view/partials.rb
@@ -52,7 +52,7 @@ module ActionView
local_assigns = extract_local_assigns(local_assigns, deprecated_local_assigns)
local_assigns = local_assigns ? local_assigns.clone : {}
add_counter_to_local_assigns!(partial_name, local_assigns)
- local_assigns[partial_name.intern] ||= object
+ local_assigns[partial_name.intern] ||= object.is_a?(ActionView::Base::ObjectWrapper) ? object.value : object
render("#{path}/_#{partial_name}", local_assigns)
end