aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-25 22:03:22 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-05-25 22:03:22 +0000
commit7f64dd4f6688149306282f1a2a951535b9493300 (patch)
treec2a7a4291607026084831a49032ff955c19d83fa
parent75348182fc76599d376a4bec04de0043f20e3d7f (diff)
downloadikiwiki-7f64dd4f6688149306282f1a2a951535b9493300.tar
ikiwiki-7f64dd4f6688149306282f1a2a951535b9493300.tar.gz
* 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.
-rw-r--r--IkiWiki/Plugin/htmlscrubber.pm3
-rw-r--r--debian/changelog8
-rw-r--r--doc/bugs.mdwn3
3 files changed, 10 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 41cf6c991..8e8391817 100644
--- 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
- }}],
+ }, "/" => 1, # emit proper <hr /> XHTML
+ }],
);
return $_scrubber;
} # }}}
diff --git a/debian/changelog b/debian/changelog
index 1ab9edf94..65808d4d5 100644
--- 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
diff --git a/doc/bugs.mdwn b/doc/bugs.mdwn
index 4c949b59b..c646242aa 100644
--- 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).
-* 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>