X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/a14548a6ca2bf384408b2a5f58aa337f55a392bf..ced9e33776f74d1190a104dcaf839229ba204137:/IkiWiki/Plugin/haiku.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index e2873ec6f..5a062a276 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -4,19 +4,27 @@ package IkiWiki::Plugin::haiku;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "haiku",
-		call => \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "haiku", call => \&getsetup);
+	hook(type => "preprocess", id => "haiku", call => \&preprocess);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup {
+	return
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 
 	my $haiku;
 	eval q{use Coy};
-	if ($@) {
+	if ($@ || ! Coy->can("Coy::with_haiku")) {
 		my @canned=(
 			"The lack of a Coy:
 			 No darting, subtle haiku.
@@ -43,9 +51,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