TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Revert "Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]"

Browse Source 
Revert "protected instance variables added to the deprecated config accessor

This reverts commit 4bce5ba600596b5e7afec9b097866ac259c5940a and 0ee2d3c89a893f0c53924cbb756c7e9be616eb8f.
This commit is contained in:
Carl Lerche 2010-04-16 15:33:15 -07:00
parent 09b9add8c5
commit ac015b1d07
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
actionpack/lib/abstract_controller/assigns.rb
View File

@ -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

2
actionpack/lib/abstract_controller/rendering.rb
View File

@ -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

1
actionpack/lib/action_controller/deprecated/base.rb
View File

@ -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