提交 5914875e 编写于 作者: X Xavier Noria

now for real, the suite loads everything and these went unpatched

上级 eab4860e
......@@ -107,7 +107,7 @@ def merge(hash)
# Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second.
# This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
def reverse_merge(other_hash)
super other_hash.with_indifferent_access
super self.class.new_from_hash_copying_default(other_hash)
end
def reverse_merge!(other_hash)
......@@ -138,9 +138,9 @@ def convert_key(key)
def convert_value(value)
case value
when Hash
value.with_indifferent_access
self.class.new_from_hash_copying_default(value)
when Array
value.collect { |e| e.is_a?(Hash) ? e.with_indifferent_access : e }
value.collect { |e| e.is_a?(Hash) ? self.class.new_from_hash_copying_default(e) : e }
else
value
end
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册