kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

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

This commit is contained in:
Xavier Noria 2010-08-19 02:57:10 +02:00
parent eab4860e9b
commit 5914875e77
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
activesupport/lib/active_support/hash_with_indifferent_access.rb
View File

@ -107,7 +107,7 @@ module ActiveSupport
# Performs the opposite of merge, with the keys and values from the first hash taking precedence over the second. # 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. # This overloaded definition prevents returning a regular hash, if reverse_merge is called on a HashWithDifferentAccess.
def reverse_merge(other_hash) def reverse_merge(other_hash)
super other_hash.with_indifferent_access super self.class.new_from_hash_copying_default(other_hash)
end end
def reverse_merge!(other_hash) def reverse_merge!(other_hash)
@ -138,9 +138,9 @@ module ActiveSupport
def convert_value(value) def convert_value(value)
case value case value
when Hash when Hash
value.with_indifferent_access self.class.new_from_hash_copying_default(value)
when Array 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 else
value value
end end