diff options
| author | Xavier Noria <fxn@hashref.com> | 2017-07-02 13:50:25 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-02 13:50:25 -0700 |
| commit | 92c29d82eb2f323bb1338a039229a66057a7d137 (patch) | |
| tree | 050eea5a719faa416b64b804617f8755b6500e09 /activesupport/lib/active_support/xml_mini/nokogiri.rb | |
| parent | f851e1f705f26d8f92f0fc1b265b20bc389d23cb (diff) | |
| parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
| download | rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.gz rails-92c29d82eb2f323bb1338a039229a66057a7d137.tar.bz2 rails-92c29d82eb2f323bb1338a039229a66057a7d137.zip | |
Merge branch 'master' into require_relative_2017
Diffstat (limited to 'activesupport/lib/active_support/xml_mini/nokogiri.rb')
| -rw-r--r-- | activesupport/lib/active_support/xml_mini/nokogiri.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb index 7ac11a9a89..57d8cec0c6 100644 --- a/activesupport/lib/active_support/xml_mini/nokogiri.rb +++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb @@ -57,7 +57,7 @@ module ActiveSupport if c.element? c.to_hash(node_hash) elsif c.text? || c.cdata? - node_hash[CONTENT_ROOT] ||= "" + node_hash[CONTENT_ROOT] ||= "".dup node_hash[CONTENT_ROOT] << c.content end end |