Avoid deprecation warnings and potential TypeErrors [#4404 state:reso…

…lved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
rails · Apr 15, 2010 · 4bce5ba · 4bce5ba · carllerche · Apr 16, 2010
1 parent 68f4e04
commit 4bce5ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
+end
diff --git 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