diff options
author | Kristijan Novoselic <kristijan@glooko.com> | 2015-06-09 19:00:24 +0200 |
---|---|---|
committer | Kristijan Novoselic <kristijan@glooko.com> | 2015-06-12 17:35:21 +0200 |
commit | f98e75a3e2b1665bd1da28b9456a296cc3c35bbc (patch) | |
tree | 05f2a8d37d15c34de3acd7fb7d44e4787d73fe2b /activesupport/lib/active_support/concern.rb | |
parent | 0b57f090c95503a14dfb3473752fecc658527d16 (diff) | |
download | rails-f98e75a3e2b1665bd1da28b9456a296cc3c35bbc.tar.gz rails-f98e75a3e2b1665bd1da28b9456a296cc3c35bbc.tar.bz2 rails-f98e75a3e2b1665bd1da28b9456a296cc3c35bbc.zip |
Fix for #20489 - ActiveSupport::Concern#class_methods affects parent classes
Diffstat (limited to 'activesupport/lib/active_support/concern.rb')
-rw-r--r-- | activesupport/lib/active_support/concern.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/concern.rb b/activesupport/lib/active_support/concern.rb index 4082d2d464..0403eb70ca 100644 --- a/activesupport/lib/active_support/concern.rb +++ b/activesupport/lib/active_support/concern.rb @@ -132,7 +132,7 @@ module ActiveSupport end def class_methods(&class_methods_module_definition) - mod = const_defined?(:ClassMethods) ? + mod = const_defined?(:ClassMethods, false) ? const_get(:ClassMethods) : const_set(:ClassMethods, Module.new) |