diff options
| author | José Valim <jose.valim@gmail.com> | 2011-05-06 14:32:48 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2011-05-06 14:57:25 +0200 |
| commit | 894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (patch) | |
| tree | 6f6e2b8105891f1600b5b173f6805a1a3c6e8ea9 /actionpack/lib/action_controller | |
| parent | be9857c21d9bf3e4c51a159b7d4edef69e203a57 (diff) | |
| download | rails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.tar.gz rails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.tar.bz2 rails-894bdbd53dd82b6b28ff2672b85f57ed5ce97759.zip | |
Move variables to underscore format, update protected instance variables list.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/compatibility.rb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb index 006b9fd456..6ee5b41c8d 100644 --- a/actionpack/lib/action_controller/metal/compatibility.rb +++ b/actionpack/lib/action_controller/metal/compatibility.rb @@ -18,13 +18,8 @@ module ActionController delegate :default_charset=, :to => "ActionDispatch::Response" end - # TODO: Update protected instance variables list - config_accessor :protected_instance_variables - self.protected_instance_variables = %w(@assigns @performed_redirect @performed_render - @variables_added @request_origin @url - @parent_controller @action_name - @before_filter_chain_aborted @_headers @_params - @_response) + self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request + @_view_runtime @_stream @_url_options) def rescue_action(env) raise env["action_dispatch.rescue.exception"] |