diff options
| author | José Valim <jose.valim@gmail.com> | 2009-07-16 00:28:33 +0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-07-16 00:28:33 +0200 |
| commit | fa5f7f7087aed5acdd225b10dc39fd53ed12eea8 (patch) | |
| tree | 4e03000f7216b320a24bf094c40359c439def7ec /activesupport/lib/active_support/core_ext/hash/reverse_merge.rb | |
| parent | e3d5364e41f2063f4ecf3be4a5f05622c045dabf (diff) | |
| parent | 0920e69244026ec83471bb4571e56300045307d3 (diff) | |
| download | rails-fa5f7f7087aed5acdd225b10dc39fd53ed12eea8.tar.gz rails-fa5f7f7087aed5acdd225b10dc39fd53ed12eea8.tar.bz2 rails-fa5f7f7087aed5acdd225b10dc39fd53ed12eea8.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activesupport/lib/active_support/core_ext/hash/reverse_merge.rb')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/hash/reverse_merge.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb index ebfdcb2cf0..d7ebd5feef 100644 --- a/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb +++ b/activesupport/lib/active_support/core_ext/hash/reverse_merge.rb @@ -21,7 +21,7 @@ class Hash # Performs the opposite of <tt>merge</tt>, with the keys and values from the first hash taking precedence over the second. # Modifies the receiver in place. def reverse_merge!(other_hash) - replace(reverse_merge(other_hash)) + merge!( other_hash ){|k,o,n| o } end alias_method :reverse_update, :reverse_merge! |