diff options
| author | José Valim <jose.valim@gmail.com> | 2010-08-11 10:26:07 -0300 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-08-11 10:26:07 -0300 |
| commit | 25f1e015c0a89a11a679cda6e2fab70b54612f65 (patch) | |
| tree | fe364552d4a9044ca0cc4679afc7ed17110b90ab /activesupport/lib/active_support/configurable.rb | |
| parent | f08b58dd0c0ad860bb119bde94a46c6330ca1556 (diff) | |
| download | rails-25f1e015c0a89a11a679cda6e2fab70b54612f65.tar.gz rails-25f1e015c0a89a11a679cda6e2fab70b54612f65.tar.bz2 rails-25f1e015c0a89a11a679cda6e2fab70b54612f65.zip | |
Ensure @config is not a reserved instance variable in controllers. [#5342 state:resolved]
Diffstat (limited to 'activesupport/lib/active_support/configurable.rb')
| -rw-r--r-- | activesupport/lib/active_support/configurable.rb | 4 |
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 |