diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2007-03-13 03:49:52 +0000 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2007-03-13 03:49:52 +0000 |
commit | 83c8db981892820b747390d854595268afade8dd (patch) | |
tree | acd18fb1a33668e50d754133c1f904317b49fdb2 /actionpack/lib/action_controller | |
parent | 9c0fe36d461264552198cdde493e91bd7c26c57c (diff) | |
download | rails-83c8db981892820b747390d854595268afade8dd.tar.gz rails-83c8db981892820b747390d854595268afade8dd.tar.bz2 rails-83c8db981892820b747390d854595268afade8dd.zip |
Deprecation: remove deprecated instance variables.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6399 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller')
-rwxr-xr-x | actionpack/lib/action_controller/base.rb | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index c0c14e55e0..0ee7bf9529 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -1112,25 +1112,6 @@ module ActionController #:nodoc: @assigns = @_response.template.assigns @_headers = @_response.headers - - assign_deprecated_shortcuts(request, response) - end - - # TODO: assigns cookies headers params request response template - DEPRECATED_INSTANCE_VARIABLES = %w(cookies flash headers params request response session) - - # Gone after 1.2. - def assign_deprecated_shortcuts(request, response) - DEPRECATED_INSTANCE_VARIABLES.each do |method| - var = "@#{method}" - if instance_variables.include?(var) - value = instance_variable_get(var) - unless ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy === value - raise "Deprecating #{var}, but it's already set to #{value.inspect}! Use the #{method}= writer method instead of setting #{var} directly." - end - end - instance_variable_set var, ActiveSupport::Deprecation::DeprecatedInstanceVariableProxy.new(self, method) - end end def initialize_current_url |