From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 5 May 2006 04:33:58 +0000 (+0000)
Subject: let's actually work, shall we?
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/a14548a6ca2bf384408b2a5f58aa337f55a392bf

let's actually work, shall we?
---

diff --git a/IkiWiki/Plugin/haiku.pm b/IkiWiki/Plugin/haiku.pm
index 0e93e9d8d..e2873ec6f 100644
--- a/IkiWiki/Plugin/haiku.pm
+++ b/IkiWiki/Plugin/haiku.pm
@@ -35,11 +35,8 @@ sub preprocess (@) { #{{{
 		$haiku=$canned[rand @canned];
 	}
 	else {
-		# Coy is rather strange, so the best way to get a haiku
-		# out of it is to die..
-		eval {die exists $params{hint} ? $params{hint} : $params{page}};
-		$haiku=$@;
-
+		$haiku=Coy::with_haiku($params{hint} ? $params{hint} : $params{page});
+		
 		# trim off other text
 		$haiku=~s/\s+-----\n//s;
 		$haiku=~s/\s+-----.*//s;
@@ -48,7 +45,7 @@ sub preprocess (@) { #{{{
 	$haiku=~s/^\s+//mg;
 	$haiku=~s/\n/<br>\n/mg;
 	
-	return $haiku
+	return "\n\n<blockquote>$haiku</blockquote>\n\n";
 } # }}}
 
 1