Hash#to_xml doesn't double-unescape. Closes #8806.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7505 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

1 files changed, 1 insertions, 9 deletions

diff --git a/activesupport/lib/active_support/core_ext/hash/conversions.rb b/activesupport/lib/active_support/core_ext/hash/conversions.rb
index d8c6852e25..97b4301bdd 100644
--- a/activesupport/lib/active_support/core_ext/hash/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/hash/conversions.rb
@@ -169,7 +169,7 @@ module ActiveSupport #:nodoc:
               case value.class.to_s
                 when 'Hash'
                   if value.has_key?("__content__")
-                    content = translate_xml_entities(value["__content__"])
+                    content = value["__content__"]
                     if parser = XML_PARSING[value["type"]]
                       if parser.arity == 2
                         XML_PARSING[value["type"]].call(content, value)
@@ -226,14 +226,6 @@ module ActiveSupport #:nodoc:
               end
             end
 
-            def translate_xml_entities(value)
-              value.gsub(/&lt;/,   "<").
-                    gsub(/&gt;/,   ">").
-                    gsub(/&quot;/, '"').
-                    gsub(/&apos;/, "'").
-                    gsub(/&amp;/,  "&")
-            end
-
             def undasherize_keys(params)
               case params.class.to_s
                 when "Hash"