* Tell HTML::Scrubber to treat "/" as a valid attribute which is its

  very strange way of enabling proper XHTML <br /> type tags. Output html
  should be always valid again now.

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 41cf6c991c868bb95c3a1bc74dbfbad4e3cf4368..8e83918170b3b8f4d11a0fed369675338eedcaca 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -43,7 +43,8 @@ sub scrubber { #{{{
                        selected shape size span src start summary
                        tabindex target title type usemap valign
                        value vspace width
                        selected shape size span src start summary
                        tabindex target title type usemap valign
                        value vspace width

-               }}],
+               }, "/" => 1, # emit proper <hr /> XHTML
+               }],

        );
        return $_scrubber;
 } # }}}
        );
        return $_scrubber;
 } # }}}

diff --git a/debian/changelog b/debian/changelog
index 1ab9edf9439b0ad301713c6eaaa258b54fd8ef85..65808d4d5fba549763173d0d1e6127a8d16a247b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ikiwiki (1.4) UNRELEASED; urgency=low
+
+  * Tell HTML::Scrubber to treat "/" as a valid attribute which is its
+    very strange way of enabling proper XHTML <br /> type tags. Output html
+    should be always valid again now.
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 25 May 2006 18:01:59 -0400
+

 ikiwiki (1.3) unstable; urgency=low
 
   * Fix the preinst introduced in the last version. Closes: #367458
 ikiwiki (1.3) unstable; urgency=low
 
   * Fix the preinst introduced in the last version. Closes: #367458

diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index 4c949b59b50aa5cd1aa692e5d4859e132fc2bbc4..c646242aaa96a20fca4b454d1472fa9cdffaf6ac 100644 (file)
--- a/doc/bugs.mdwn
+++ b/doc/bugs.mdwn
@@ -33,6 +33,3 @@
 * if a page containing an rss feed happens to show up in an rss feed,
   the preprocessor directives won't be expanded (good) but are left in
   raw rather than removed (bad).
 * if a page containing an rss feed happens to show up in an rss feed,
   the preprocessor directives won't be expanded (good) but are left in
   raw rather than removed (bad).

-* HTML::Scrubber doesn't produce valid xhtml for tags like hr, so if html
-  sanitisation is enabled the html page won't be valid.
-  <http://bugs.debian.org/365971>