TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Inline a method used by render_partial. Closes #2881.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3073 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2005-11-17 19:08:53 +00:00
parent 60e425af33
commit e9a4e4d88b
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
actionpack/lib/action_view/partials.rb
View File

@ -117,15 +117,12 @@ def add_counter_to_local_assigns!(partial_name, local_assigns)
end
def add_object_to_local_assigns!(partial_name, local_assigns, object)
local_assigns[partial_name.intern] ||= unwrap_object(object) || controller.instance_variable_get("@#{partial_name}")
end
def unwrap_object(object)
if object.is_a?(ActionView::Base::ObjectWrapper)
object.value
else
object
end
local_assigns[partial_name.intern] ||=
if object.is_a?(ActionView::Base::ObjectWrapper)
object.value
else
object
end || controller.instance_variable_get("@#{partial_name}")
end
end
end