diff options
Diffstat (limited to 'actionpack/lib/abstract_controller/rendering.rb')
-rw-r--r-- | actionpack/lib/abstract_controller/rendering.rb | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/actionpack/lib/abstract_controller/rendering.rb b/actionpack/lib/abstract_controller/rendering.rb index 9d2199a7b1..fb8f40cb9b 100644 --- a/actionpack/lib/abstract_controller/rendering.rb +++ b/actionpack/lib/abstract_controller/rendering.rb @@ -1,5 +1,6 @@ require 'active_support/concern' require 'active_support/core_ext/class/attribute' +require 'set' module AbstractController class DoubleRenderError < Error @@ -13,11 +14,6 @@ module AbstractController module Rendering extend ActiveSupport::Concern - included do - class_attribute :protected_instance_variables - self.protected_instance_variables = [] - end - # Normalize arguments, options and then delegates render_to_body and # sticks the result in self.response_body. # :api: public @@ -55,8 +51,6 @@ module AbstractController Mime::TEXT end - require 'set' - DEFAULT_PROTECTED_INSTANCE_VARIABLES = Set.new %w( @_action_name @_response_body @_formats @_prefixes @_config @_view_context_class @_view_renderer @_lookup_context @@ -113,7 +107,7 @@ module AbstractController end def _protected_ivars # :nodoc: - DEFAULT_PROTECTED_INSTANCE_VARIABLES + protected_instance_variables + DEFAULT_PROTECTED_INSTANCE_VARIABLES end end end |