diff options
Diffstat (limited to 'activesupport/lib')
| -rw-r--r-- | activesupport/lib/active_support/ordered_hash.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/ordered_hash.rb b/activesupport/lib/active_support/ordered_hash.rb index eda33f827e..b721e6f70a 100644 --- a/activesupport/lib/active_support/ordered_hash.rb +++ b/activesupport/lib/active_support/ordered_hash.rb @@ -131,7 +131,7 @@ module ActiveSupport def merge!(other_hash) if block_given? - other_hash.each {|k,v| self[k] = yield(k, self[k], v) } + other_hash.each {|k,v| self[k] = yield(k, self[k], v) if key? k} else other_hash.each {|k,v| self[k] = v } end |