aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-05-06 14:56:51 +0200
committerJosé Valim <jose.valim@gmail.com>2011-05-06 14:57:25 +0200
commitd42bb6843073b876e6a79e396a947c267fcbbf75 (patch)
treeebaebf7d9a59bbf5531b89a8fe185e838dd5e33b /actionpack/lib/action_controller
parent894bdbd53dd82b6b28ff2672b85f57ed5ce97759 (diff)
downloadrails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.gz
rails-d42bb6843073b876e6a79e396a947c267fcbbf75.tar.bz2
rails-d42bb6843073b876e6a79e396a947c267fcbbf75.zip
More updates to ivars list.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/compatibility.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/compatibility.rb b/actionpack/lib/action_controller/metal/compatibility.rb
index 6ee5b41c8d..05dca445a4 100644
--- a/actionpack/lib/action_controller/metal/compatibility.rb
+++ b/actionpack/lib/action_controller/metal/compatibility.rb
@@ -18,8 +18,10 @@ module ActionController
delegate :default_charset=, :to => "ActionDispatch::Response"
end
- self.protected_instance_variables = %w(@_headers @_params @_env @_response @_request
- @_view_runtime @_stream @_url_options)
+ self.protected_instance_variables = %w(
+ @_status @_headers @_params @_env @_response @_request
+ @_view_runtime @_stream @_url_options @_action_has_layout
+ )
def rescue_action(env)
raise env["action_dispatch.rescue.exception"]