diff options
| author | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-28 23:43:33 +0200 |
|---|---|---|
| committer | Łukasz Strzałkowski <lukasz.strzalkowski@gmail.com> | 2013-08-29 12:13:45 +0200 |
| commit | 7de994fa215e9f4c2856d85034bc4dd7b65d0c01 (patch) | |
| tree | 4455776ba6a5ef6d07d4eb9900cea9f310b4b6c7 /actionpack/lib/action_controller | |
| parent | 55c9109b5a4e5018973d3f9856d0ba15123ae3a9 (diff) | |
| download | rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.gz rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.tar.bz2 rails-7de994fa215e9f4c2856d85034bc4dd7b65d0c01.zip | |
Port all remaining self.protected_instance_variables to class methods
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 9941c06201..a00eafc9ed 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -261,11 +261,12 @@ module ActionController include mod end - # Define some internal variables that should not be propagated to the view. - self.protected_instance_variables = [ - :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, - :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout - ] + def self.default_protected_instance_vars + super.concat [ + :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request, + :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout + ] + end ActiveSupport.run_load_hooks(:action_controller, self) end |