Permalink
Browse files

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

  • Loading branch information...
1 parent eab4860 commit 5914875e773ef3958617b71016bd79de628033bc @fxn fxn committed Aug 19, 2010
Showing with 3 additions and 3 deletions.
  1. +3 −3 activesupport/lib/active_support/hash_with_indifferent_access.rb
@@ -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

0 comments on commit 5914875

Please sign in to comment.