github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-02-07 20:54:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Don't construct object deprecation proxy if unneeded

Browse Source
This commit is contained in:
Jeremy Kemper
2008-12-22 14:48:32 -08:00
parent 606cd61b9a
commit 2e053aec9b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
actionpack/lib/action_view/renderable_partial.rb
View File

@@ -25,12 +25,11 @@ module ActionView
end
def render_partial(view, object = nil, local_assigns = {}, as = nil)
object ||= local_assigns[:object] ||
local_assigns[variable_name]
object ||= local_assigns[:object] || local_assigns[variable_name]
if view.respond_to?(:controller)
if object.nil? && view.respond_to?(:controller)
ivar = :"@#{variable_name}"
object ||=
object =
if view.controller.instance_variable_defined?(ivar)
ActiveSupport::Deprecation::DeprecatedObjectProxy.new(
view.controller.instance_variable_get(ivar),