mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
fix problem with EMPTY_INHERITABLE_ATTRIBUTES being redefined
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6115 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
7a49cb058f
commit
4790228bc4
1 changed files with 2 additions and 1 deletions
|
@ -118,7 +118,8 @@ class Class # :nodoc:
|
|||
end
|
||||
|
||||
private
|
||||
EMPTY_INHERITABLE_ATTRIBUTES = {}.freeze
|
||||
# Prevent this constant from being created multiple times
|
||||
EMPTY_INHERITABLE_ATTRIBUTES = {}.freeze unless const_defined?(:EMPTY_INHERITABLE_ATTRIBUTES)
|
||||
|
||||
def inherited_with_inheritable_attributes(child)
|
||||
inherited_without_inheritable_attributes(child) if respond_to?(:inherited_without_inheritable_attributes)
|
||||
|
|
Loading…
Reference in a new issue