haiku: Generate valid xhtml.

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 35208e56cfcc307ba95f23555ec537d1b78859e7..5d5e8d5aaf93089fe84cc3774966f7a914aa516c 100644 (file)
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -42,9 +42,9 @@ sub preprocess (@) { #{{{
        }
                
        $haiku=~s/^\s+//mg;
-       $haiku=~s/\n/<br>\n/mg;
+       $haiku=~s/\n/<br \/>\n/mg;
        
-       return "\n\n<blockquote>$haiku</blockquote>\n\n";
+       return "\n\n<blockquote><p>$haiku</p></blockquote>\n\n";
 } # }}}
 
 1

diff --git a/debian/changelog b/debian/changelog
index 0edd2ab33bfd3205f5ee2046fdc4369e2d768933..86f1f036dfd22fc61470cbfd37cf82c425e31b0c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+ikiwiki (2.49) UNRELEASED; urgency=low
+
+  * haiku: Generate valid xhtml.
+
+ -- Joey Hess <joeyh@debian.org>  Fri, 30 May 2008 19:08:54 -0400
+
 ikiwiki (2.48) unstable; urgency=high
 
   * Fix security hole that occurred if openid and passwordauth were both

diff --git a/doc/plugins/haiku/discussion.mdwn b/doc/plugins/haiku/discussion.mdwn
index 3b19eddd9be24fb8aea07f8451aeaf9e261c6f1a..a5d0939ce0240818fa3885a8a9d9e5516b0f65ec 100644 (file)
--- a/doc/plugins/haiku/discussion.mdwn
+++ b/doc/plugins/haiku/discussion.mdwn
@@ -1,3 +1,5 @@
 The output of this plugin does not validate as XHTML: [validator.w3.org][w3] --ulrik
 
 [w3]: http://validator.w3.org/check?uri=http%3A%2F%2Fikiwiki.info%2Fplugins%2Fhaiku%2Findex.html&charset=%28detect+automatically%29&doctype=Inline&group=0
+
+> Fixed --[[Joey]]