Ensure @config is not a reserved instance variable in controllers. [#5342 state:resolved]

1 files changed, 2 insertions, 2 deletions

diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
index f562e17c75..a0c9c9e33a 100644
--- a/activesupport/lib/active_support/configurable.rb
+++ b/activesupport/lib/active_support/configurable.rb
@@ -9,7 +9,7 @@ module ActiveSupport
 
     module ClassMethods
       def config
-        @config ||= ActiveSupport::InheritableOptions.new(superclass.respond_to?(:config) ? superclass.config : {})
+        @_config ||= ActiveSupport::InheritableOptions.new(superclass.respond_to?(:config) ? superclass.config : {})
       end
 
       def configure
@@ -30,7 +30,7 @@ module ActiveSupport
     end
 
     def config
-      @config ||= ActiveSupport::InheritableOptions.new(self.class.config)
+      @_config ||= ActiveSupport::InheritableOptions.new(self.class.config)
     end
   end
 end
\ No newline at end of file