From 0a35e8a3525db58bf38cd6ffdc45c7baaae04dd8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Fri, 30 May 2008 19:10:58 -0400
Subject: haiku: Generate valid xhtml.

---
 IkiWiki/Plugin/haiku.pm           | 4 ++--
 debian/changelog                  | 6 ++++++
 doc/plugins/haiku/discussion.mdwn | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 35208e56c..5d5e8d5aa 100644
--- 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 0edd2ab33..86f1f036d 100644
--- 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 3b19eddd9..a5d0939ce 100644
--- 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]]
-- 
cgit v1.2.3