From 1bc5da00532e601813173f06961f88308f6118bd Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Wed, 4 Jul 2007 18:53:03 -0500
Subject: [PATCH] Use XHTMLSerializer, where appropriate.

---
 lib/sanitize.rb                                 | 6 +-----
 vendor/plugins/HTML5lib/tests/test_sanitizer.rb | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/lib/sanitize.rb b/lib/sanitize.rb
index c0773fd4..3e0e6b15 100644
--- a/lib/sanitize.rb
+++ b/lib/sanitize.rb
@@ -99,12 +99,8 @@ module Sanitize
 #
   def sanitize_rexml(tree)
     tokens = TreeWalkers.getTreeWalker('rexml').new(tree.to_ncr)
-    HTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
-      :quote_attr_values => true,
-      :minimize_boolean_attributes => false,
-      :use_trailing_solidus => true,
+    XHTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
       :space_before_trailing_solidus => true,
-      :omit_optional_tags => false,
       :inject_meta_charset => false,
       :sanitize => true})
   end
diff --git a/vendor/plugins/HTML5lib/tests/test_sanitizer.rb b/vendor/plugins/HTML5lib/tests/test_sanitizer.rb
index f817146b..3f22322e 100644
--- a/vendor/plugins/HTML5lib/tests/test_sanitizer.rb
+++ b/vendor/plugins/HTML5lib/tests/test_sanitizer.rb
@@ -23,12 +23,8 @@ class SanitizeTest < Test::Unit::TestCase
     require 'rexml/document'
     doc = REXML::Document.new("<div xmlns='http://www.w3.org/1999/xhtml'>#{stream}</div>")
     tokens = TreeWalkers.getTreeWalker('rexml').new(doc)
-    HTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
-      :quote_attr_values => true,
+    XHTMLSerializer.serialize(tokens, {:encoding=>'utf-8',
       :quote_char => "'",
-      :minimize_boolean_attributes => false,
-      :use_trailing_solidus => true,
-      :omit_optional_tags => false,
       :inject_meta_charset => false,
       :sanitize => true}).gsub(/\A<div xmlns='http:\/\/www.w3.org\/1999\/xhtml'>(.*)<\/div>\Z/m, '\1')
   rescue REXML::ParseException