diff options
| author | Carl Lerche <carllerche@mac.com> | 2010-04-16 15:33:15 -0700 |
|---|---|---|
| committer | Carl Lerche <carllerche@mac.com> | 2010-04-16 15:39:00 -0700 |
| commit | ac015b1d07241f9702af41b079d27985c9b9a20f (patch) | |
| tree | d27c60a4e0c62679818c21f9737c34548d0ee4dd /actionpack | |
| parent | 09b9add8c5eb85e7369d98a6efa11c5b27787838 (diff) | |
| download | rails-ac015b1d07241f9702af41b079d27985c9b9a20f.tar.gz rails-ac015b1d07241f9702af41b079d27985c9b9a20f.tar.bz2 rails-ac015b1d07241f9702af41b079d27985c9b9a20f.zip | |
Revert "Avoid deprecation warnings and potential TypeErrors [#4404 state:resolved]"
Revert "protected instance variables added to the deprecated config accessor
This reverts commit 4bce5ba600596b5e7afec9b097866ac259c5940a and 0ee2d3c89a893f0c53924cbb756c7e9be616eb8f.
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/abstract_controller/assigns.rb | 4 | ||||
| -rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/deprecated/base.rb | 1 |
3 files changed, 3 insertions, 4 deletions
diff --git a/actionpack/lib/abstract_controller/assigns.rb b/actionpack/lib/abstract_controller/assigns.rb index 4f58cac91f..21459c6d51 100644 --- a/actionpack/lib/abstract_controller/assigns.rb +++ b/actionpack/lib/abstract_controller/assigns.rb @@ -6,7 +6,7 @@ module AbstractController 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 @@ module AbstractController view_assigns.each { |k,v| object.instance_variable_set(k, v) } end end -end +end
\ No newline at end of file diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index f1e6f7deb6..d2db366140 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -126,7 +126,7 @@ module AbstractController 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 diff --git a/actionpack/lib/action_controller/deprecated/base.rb b/actionpack/lib/action_controller/deprecated/base.rb index f91f637db8..57203ce95f 100644 --- a/actionpack/lib/action_controller/deprecated/base.rb +++ b/actionpack/lib/action_controller/deprecated/base.rb @@ -154,7 +154,6 @@ module ActionController 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 |