aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support/xml_mini/libxmlsax.rb
diff options
context:
space:
mode:
authorVipul A M <vipulnsward@gmail.com>2013-04-02 11:13:56 +0530
committerVipul A M <vipulnsward@gmail.com>2013-04-02 11:13:56 +0530
commit187969069a1d76b93088ec8f574b8c80252dbb51 (patch)
tree2bd2e05879ca7110fe810c58280f3e759396a982 /activesupport/lib/active_support/xml_mini/libxmlsax.rb
parent98b52826fe0de4d89df1bef7b72c9f8ca0db7bbc (diff)
downloadrails-187969069a1d76b93088ec8f574b8c80252dbb51.tar.gz
rails-187969069a1d76b93088ec8f574b8c80252dbb51.tar.bz2
rails-187969069a1d76b93088ec8f574b8c80252dbb51.zip
change merge to merge! in AS on new hashes
Diffstat (limited to 'activesupport/lib/active_support/xml_mini/libxmlsax.rb')
-rw-r--r--activesupport/lib/active_support/xml_mini/libxmlsax.rb2
1 files changed, 1 insertions, 1 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]