diff options
author | Xavier Noria <fxn@hashref.com> | 2010-08-19 02:57:10 +0200 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2010-08-19 02:57:10 +0200 |
commit | 5914875e773ef3958617b71016bd79de628033bc (patch) | |
tree | ac9263450fd885417ec583c99e583d9b12cc5f6f /activesupport/lib/active_support | |
parent | eab4860e9b8b81522df481e1e046d142af0455ee (diff) | |
download | rails-5914875e773ef3958617b71016bd79de628033bc.tar.gz rails-5914875e773ef3958617b71016bd79de628033bc.tar.bz2 rails-5914875e773ef3958617b71016bd79de628033bc.zip |
now for real, the suite loads everything and these went unpatched
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r-- | activesupport/lib/active_support/hash_with_indifferent_access.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/hash_with_indifferent_access.rb b/activesupport/lib/active_support/hash_with_indifferent_access.rb index aa21a2702b..e8215bc566 100644 --- a/activesupport/lib/active_support/hash_with_indifferent_access.rb +++ b/activesupport/lib/active_support/hash_with_indifferent_access.rb @@ -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. # 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 @@ module ActiveSupport 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 |