diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 05:24:16 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-04-02 05:24:16 -0700 |
| commit | 2a27485c68aba36c33897ae96f15fda9abb5a6a4 (patch) | |
| tree | 383bf91af3ebf601509123f7e0b850144e0a2143 /activesupport | |
| parent | a18c9f07fc1f4952d48e4f0473a3f14909068c62 (diff) | |
| parent | 187969069a1d76b93088ec8f574b8c80252dbb51 (diff) | |
| download | rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.tar.gz rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.tar.bz2 rails-2a27485c68aba36c33897ae96f15fda9abb5a6a4.zip | |
Merge pull request #10041 from vipulnsward/more_destructive_merge
change merge to merge! in AS on new hashes
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/libxmlsax.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/nokogirisax.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/xml_mini/libxmlsax.rb b/activesupport/lib/active_support/xml_mini/libxmlsax.rb index acc018fd2d..70a95299ec 100644 --- a/activesupport/lib/active_support/xml_mini/libxmlsax.rb +++ b/activesupport/lib/active_support/xml_mini/libxmlsax.rb @@ -32,7 +32,7 @@ module ActiveSupport end def on_start_element(name, attrs = {}) - new_hash = { CONTENT_KEY => '' }.merge(attrs) + new_hash = { CONTENT_KEY => '' }.merge!(attrs) new_hash[HASH_SIZE_KEY] = new_hash.size + 1 case current_hash[name] diff --git a/activesupport/lib/active_support/xml_mini/nokogirisax.rb b/activesupport/lib/active_support/xml_mini/nokogirisax.rb index 30b94aac47..be2d6a4cb1 100644 --- a/activesupport/lib/active_support/xml_mini/nokogirisax.rb +++ b/activesupport/lib/active_support/xml_mini/nokogirisax.rb @@ -38,7 +38,7 @@ module ActiveSupport end def start_element(name, attrs = []) - new_hash = { CONTENT_KEY => '' }.merge(Hash[attrs]) + new_hash = { CONTENT_KEY => '' }.merge!(Hash[attrs]) new_hash[HASH_SIZE_KEY] = new_hash.size + 1 case current_hash[name] |