Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index a0bb2ff3128e4f9a5d3853f5006aa0d76a074004..9f9b50f017bb5cb75a5ed1155984531d082d200d 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -6,15 +6,24 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
+       hook(type => "getsetup", id => "testpagespec", call => \&getsetup);
        hook(type => "preprocess", id => "testpagespec", call => \&preprocess);
 } # }}}
 
+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+
 sub preprocess (@) { #{{{
        my %params=@_;
        
        foreach my $param (qw{match pagespec}) {
                if (! exists $params{$param}) {
-                       return "[[testpagespec missing $param parameter]]";
+                       error sprintf(gettext("%s parameter is required"), $param);
                }
        }
 
@@ -25,9 +34,6 @@ sub preprocess (@) { #{{{
        if ($ret) {
                return "match: $ret";
        }
-       elsif (! defined $ret) {
-               return "match failed: $@";
-       }
        else {
                return "no match: $ret";
        }