Merge commit 'origin'

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

diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 8e96bdbbd1e442be73b45586f3fd276b2ea9b0e2..456b63e9f341f215dba522603c20c8a005fec7a0 100644 (file)
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -4,18 +4,27 @@ package IkiWiki::Plugin::fortune;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "fortune",
-               call => \&preprocess);
+       hook(type => "getsetup", id => "fortune", call => \&getsetup);
+       hook(type => "preprocess", id => "fortune", call => \&preprocess);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        $ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
 sub preprocess (@) { #{{{
        $ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";

-       my $f = `fortune`;
+       my $f = `fortune 2>/dev/null`;

 
        if ($?) {
 
        if ($?) {

-               return "[[fortune failed]]";
+               error gettext("fortune failed");

        }
        else {
                return "<pre>$f</pre>\n";
        }
        else {
                return "<pre>$f</pre>\n";