From e9a4e4d88b6377ce1b6167149ea45767018dac65 Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Thu, 17 Nov 2005 19:08:53 +0000 Subject: [PATCH] Inline a method used by render_partial. Closes #2881. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3073 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_view/partials.rb | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/actionpack/lib/action_view/partials.rb b/actionpack/lib/action_view/partials.rb index aaef0c4f3d..063ff5688d 100644 --- a/actionpack/lib/action_view/partials.rb +++ b/actionpack/lib/action_view/partials.rb @@ -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