Permalink
Browse files

Revert "Avoid deprecation warnings and potential TypeErrors [#4404 st…

…ate:resolved]"

Revert "protected instance variables added to the deprecated config accessor

This reverts commit 4bce5ba and 0ee2d3c.
  • Loading branch information...
1 parent 09b9add commit ac015b1d07241f9702af41b079d27985c9b9a20f Carl Lerche committed Apr 16, 2010
@@ -6,7 +6,7 @@ module Assigns
def view_assigns
hash = {}
variables = instance_variable_names
- variables -= config.protected_instance_variables if config.respond_to?(:protected_instance_variables)
+ variables -= protected_instance_variables if 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
@@ -126,7 +126,7 @@ def _prefix
def view_assigns
hash = {}
variables = instance_variable_names
- variables -= config.protected_instance_variables if config.respond_to?(:protected_instance_variables)
+ variables -= protected_instance_variables if respond_to?(:protected_instance_variables)
variables.each { |name| hash[name.to_s[1..-1]] = instance_variable_get(name) }
hash
end
@@ -154,7 +154,6 @@ def verify(*args)
deprecated_config_accessor :helpers_path
deprecated_config_accessor :javascripts_dir
deprecated_config_accessor :page_cache_directory
- deprecated_config_accessor :protected_instance_variables
deprecated_config_accessor :relative_url_root, "relative_url_root is ineffective. Please stop using it"
deprecated_config_accessor :stylesheets_dir

0 comments on commit ac015b1

Please sign in to comment.