From 029886857322ac73db9bf3cde9aaf7ca94e0e44b Mon Sep 17 00:00:00 2001
From: Jacques Distler <distler@golem.ph.utexas.edu>
Date: Thu, 7 Jun 2007 17:30:42 -0500
Subject: [PATCH] Fix S5 Unicode Make sure sanitize_xhtml and sanitize_html are
 set to utf-8 encoding. Also, a stylesheet tweak.

---
 lib/sanitize.rb                | 4 ++--
 public/stylesheets/instiki.css | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/sanitize.rb b/lib/sanitize.rb
index 3fb3005d..34d52e8c 100644
--- a/lib/sanitize.rb
+++ b/lib/sanitize.rb
@@ -22,11 +22,11 @@ module Sanitize
   include HTML5lib
 
   def sanitize_xhtml(html)
-    XHTMLParser.parseFragment(html.to_ncr, :tokenizer => HTMLSanitizer).to_s
+    XHTMLParser.parseFragment(html.to_ncr, {:tokenizer => HTMLSanitizer, :encoding=>'utf-8' }).to_s
   end
 
   def sanitize_html(html)
-    HTMLParser.parseFragment(html, :tokenizer => HTMLSanitizer).to_s
+    HTMLParser.parseFragment(html, {:tokenizer => HTMLSanitizer, :encoding=>'utf-8' }).to_s
   end
 
   def sanitize_rexml(tree)
diff --git a/public/stylesheets/instiki.css b/public/stylesheets/instiki.css
index 4fb88d1d..6cecf4a9 100644
--- a/public/stylesheets/instiki.css
+++ b/public/stylesheets/instiki.css
@@ -336,6 +336,7 @@ font-size:70%;
 
 div.rightHandSide {
 border-left:1px dotted #ccc;
+border-bottom:1px dotted #ccc;
 float:right;
 font-size:80%;
 margin-left:0.7em;