diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-05 04:33:58 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-05-05 04:33:58 +0000 |
| commit | a14548a6ca2bf384408b2a5f58aa337f55a392bf (patch) | |
| tree | f7a3e956885f7e3d442e91e343564c60b2b6900b /IkiWiki | |
| parent | a59b1ac8d8eb220fd4f574af4a8a6742825aac6f (diff) | |
| download | ikiwiki-a14548a6ca2bf384408b2a5f58aa337f55a392bf.tar ikiwiki-a14548a6ca2bf384408b2a5f58aa337f55a392bf.tar.gz | |
let's actually work, shall we?
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/haiku.pm | 9 |
1 files changed, 3 insertions, 6 deletions
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 |