From d42bb6843073b876e6a79e396a947c267fcbbf75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Fri, 6 May 2011 14:56:51 +0200
Subject: More updates to ivars list.

---
 actionpack/lib/abstract_controller/layouts.rb           | 6 +++---
 actionpack/lib/abstract_controller/rendering.rb         | 2 +-
 actionpack/lib/action_controller/metal/compatibility.rb | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'actionpack/lib')

diff --git a/actionpack/lib/abstract_controller/layouts.rb b/actionpack/lib/abstract_controller/layouts.rb
index d1b87b67ee..8f73e244d7 100644
--- a/actionpack/lib/abstract_controller/layouts.rb
+++ b/actionpack/lib/abstract_controller/layouts.rb
@@ -292,15 +292,15 @@ module AbstractController
       end
     end
 
-    attr_writer :action_has_layout
+    attr_internal_writer :action_has_layout
 
     def initialize(*)
-      @action_has_layout = true
+      @_action_has_layout = true
       super
     end
 
     def action_has_layout?
-      @action_has_layout
+      @_action_has_layout
     end
 
   private
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb
index 09398c322a..ab2c532859 100644
--- a/actionpack/lib/abstract_controller/rendering.rb
+++ b/actionpack/lib/abstract_controller/rendering.rb
@@ -123,7 +123,7 @@ module AbstractController
     private
 
     DEFAULT_PROTECTED_INSTANCE_VARIABLES = %w(
-      @_action_name @_response_body @_formats @_prefixes
+      @_action_name @_response_body @_formats @_prefixes @_config
       @_view_context_class @_view_renderer @_lookup_context
     )
 
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"]
-- 
cgit v1.2.3