From 4bce5ba600596b5e7afec9b097866ac259c5940a Mon Sep 17 00:00:00 2001 From: Nicolas Sanguinetti Date: Thu, 15 Apr 2010 09:56:45 -0300 Subject: [PATCH] Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved] Signed-off-by: Pratik Naik --- actionpack/lib/abstract_controller/assigns.rb | 4 ++-- actionpack/lib/abstract_controller/rendering.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/actionpack/lib/abstract_controller/assigns.rb b/actionpack/lib/abstract_controller/assigns.rb index 21459c6d5121e..4f58cac91fbe0 100644 --- a/actionpack/lib/abstract_controller/assigns.rb +++ b/actionpack/lib/abstract_controller/assigns.rb @@ -6,7 +6,7 @@ module Assigns def view_assigns hash = {} variables = instance_variable_names - variables -= protected_instance_variables if respond_to?(:protected_instance_variables) + variables -= config.protected_instance_variables if config.respond_to?(:protected_instance_variables) variables.each { |name| hash[name] = instance_variable_get(name) } hash end @@ -18,4 +18,4 @@ def _evaluate_assigns(object) view_assigns.each { |k,v| object.instance_variable_set(k, v) } end end -end \ No newline at end of file +end diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index d2db366140a2f..f1e6f7deb6770 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -126,7 +126,7 @@ def _prefix def view_assigns hash = {} variables = instance_variable_names - variables -= protected_instance_variables if respond_to?(:protected_instance_variables) + variables -= config.protected_instance_variables if config.respond_to?(:protected_instance_variables) variables.each { |name| hash[name.to_s[1..-1]] = instance_variable_get(name) } hash end