aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-02 14:29:36 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-09-02 14:29:36 -0700
commite3b695331d95022f9b41faf131f8e98cdf4f6985 (patch)
treee21ed9bc1230900d401e1412ae86f24625942ea0 /actionpack/lib/action_controller
parent90ea6f928ce0f0efef3109045a74469c4a3e3f99 (diff)
parent544d0fad3d76bd3077225c6afcb562197f240cb0 (diff)
downloadrails-e3b695331d95022f9b41faf131f8e98cdf4f6985.tar.gz
rails-e3b695331d95022f9b41faf131f8e98cdf4f6985.tar.bz2
rails-e3b695331d95022f9b41faf131f8e98cdf4f6985.zip
Merge pull request #12110 from strzalek/revert-default-protected-instance-vars
Revert default protected instance vars
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/base.rb11
1 files changed, 5 insertions, 6 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index a00eafc9ed..9941c06201 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -261,12 +261,11 @@ module ActionController
include mod
end
- def self.default_protected_instance_vars
- super.concat [
- :@_status, :@_headers, :@_params, :@_env, :@_response, :@_request,
- :@_view_runtime, :@_stream, :@_url_options, :@_action_has_layout
- ]
- 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
+ ]
ActiveSupport.run_load_hooks(:action_controller, self)
end