diff options
| author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-05 11:18:10 -0500 |
|---|---|---|
| committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2016-05-05 11:18:10 -0500 |
| commit | cece50d3a6b432f848ca04a92da331f8b032d51f (patch) | |
| tree | 19e2bc3d3c6ce626c7bf473c1024c755ed11cabb /actionpack/lib/action_controller | |
| parent | 19ba522b90f4b3e5daf469fbbccce708a8cc70ce (diff) | |
| download | rails-cece50d3a6b432f848ca04a92da331f8b032d51f.tar.gz rails-cece50d3a6b432f848ca04a92da331f8b032d51f.tar.bz2 rails-cece50d3a6b432f848ca04a92da331f8b032d51f.zip | |
Move protected instance variable to the right place
There were a lot of protected instance variables in
AbsctractController::Rendering that were related to Action Controller
and Action View.
Moving to ActionController::Base's protected instance list we make it
closer to where they are really defined.
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 56a8d2e5f4..54dc6f48c5 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -251,9 +251,10 @@ module ActionController setup_renderer! # Define some internal variables that should not be propagated to the view. - PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + [ - :@_params, :@_response, :@_request, - :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout ] + PROTECTED_IVARS = AbstractController::Rendering::DEFAULT_PROTECTED_INSTANCE_VARIABLES + %i( + @_params @_response @_request @_config @_url_options @_action_has_layout @_view_context_class + @_view_renderer @_lookup_context @_routes @_view_runtime @_db_runtime + ) def _protected_ivars # :nodoc: PROTECTED_IVARS |