Ensure @config is not a reserved instance variable in controllers. [#…

…5342 state:resolved]
rails · Aug 11, 2010 · e1b85c3 · e1b85c3
1 parent 1fbcd5f
commit e1b85c3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb
@@ -9,7 +9,7 @@ module Configurable
 
     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 @@ def #{name}=(value); config.#{name} = value; end
     end
 
     def config
-      @config ||= ActiveSupport::InheritableOptions.new(self.class.config)
+      @_config ||= ActiveSupport::InheritableOptions.new(self.class.config)
     end
   end
 end