From 25f1e015c0a89a11a679cda6e2fab70b54612f65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Valim?= Date: Wed, 11 Aug 2010 10:26:07 -0300 Subject: Ensure @config is not a reserved instance variable in controllers. [#5342 state:resolved] --- activesupport/lib/active_support/configurable.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'activesupport') 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 -- cgit v1.2.3