diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-06-30 21:39:22 +0300 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-07-03 19:26:56 +0300 |
| commit | df36a6f7598a7e963fb3d79fb48fd1c073045a43 (patch) | |
| tree | 773e7ba8392adf6d2f4598eb18985bd512df0531 /actionpack/lib/action_view/partial_template.rb | |
| parent | efd18066a25610e5c00c7e144a9a08023016e576 (diff) | |
| download | rails-df36a6f7598a7e963fb3d79fb48fd1c073045a43.tar.gz rails-df36a6f7598a7e963fb3d79fb48fd1c073045a43.tar.bz2 rails-df36a6f7598a7e963fb3d79fb48fd1c073045a43.zip | |
Remove unneeded ObjectWrapper class.
Was previously needed to work around the semantics of a deprecated (now removed) API to render :partial
Diffstat (limited to 'actionpack/lib/action_view/partial_template.rb')
| -rw-r--r-- | actionpack/lib/action_view/partial_template.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/actionpack/lib/action_view/partial_template.rb b/actionpack/lib/action_view/partial_template.rb index 719199f19d..6ebe165a15 100644 --- a/actionpack/lib/action_view/partial_template.rb +++ b/actionpack/lib/action_view/partial_template.rb @@ -42,12 +42,7 @@ module ActionView #:nodoc: private def add_object_to_local_assigns!(object) @locals[:object] ||= - @locals[@variable_name] ||= - if object.is_a?(ActionView::Base::ObjectWrapper) - object.value - else - object - end || @view_controller.instance_variable_get("@#{variable_name}") + @locals[@variable_name] ||= object || @view_controller.instance_variable_get("@#{variable_name}") @locals[as] ||= @locals[:object] if as end |