Permalink
Browse files

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

…5342 state:resolved]
  • Loading branch information...
1 parent f08b58d commit 25f1e015c0a89a11a679cda6e2fab70b54612f65 @josevalim josevalim committed Aug 11, 2010
Showing with 2 additions and 2 deletions.
  1. +2 −2 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

0 comments on commit 25f1e01

Please sign in to comment.