consistently drop NAME= in templates

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

diff --git a/IkiWiki/Plugin/fortune.pm b/IkiWiki/Plugin/fortune.pm
index 3bab134bed8e8d4bf152dee04bbff1bdb42a9727..f481c7eacea7240b3b8032311d3c4e9b307bfe63 100644 (file)
--- a/IkiWiki/Plugin/fortune.pm
+++ b/IkiWiki/Plugin/fortune.pm
@@ -2,24 +2,34 @@
 # Include a fortune in a page
 package IkiWiki::Plugin::fortune;
 
 # Include a fortune in a page
 package IkiWiki::Plugin::fortune;
 

-use IkiWiki;

 use warnings;
 use strict;
 use warnings;
 use strict;

+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "fortune", call => \&getsetup);

        hook(type => "preprocess", id => "fortune", call => \&preprocess);
        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 2>/dev/null`;
 
        if ($?) {
        $ENV{PATH}="$ENV{PATH}:/usr/games:/usr/local/games";
        my $f = `fortune 2>/dev/null`;
 
        if ($?) {

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

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

-} # }}}
+}

 
 1
 
 1