Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / IkiWiki / Plugin / fortune.pm

diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 8e96bdbbd1e442be73b45586f3fd276b2ea9b0e2..f481c7eacea7240b3b8032311d3c4e9b307bfe63 100644 (file)
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -4,22 +4,32 @@ package IkiWiki::Plugin::fortune;
 
 use warnings;
 use strict;
+use IkiWiki 3.00;
 
-sub import { #{{{
-       IkiWiki::hook(type => "preprocess", id => "fortune",
-               call => \&preprocess);
-} # }}}
+sub import {
+       hook(type => "getsetup", id => "fortune", call => \&getsetup);
+       hook(type => "preprocess", id => "fortune", call => \&preprocess);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+                       section => "widget",
+               },
+}
+
+sub preprocess (@) {
        $ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
-       my $f = `fortune`;
+       my $f = `fortune 2>/dev/null`;
 
        if ($?) {
-               return "[[fortune failed]]";
+               error gettext("fortune failed");
        }
        else {
                return "<pre>$f</pre>\n";
        }
-} # }}}
+}
 
 1