cherry-pick uri security fix

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index a0bb2ff3128e4f9a5d3853f5006aa0d76a074004..f9ec90d8791f8b5e6aa422ceb527fe272bfea9df 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -14,7 +14,7 @@ sub preprocess (@) { #{{{
        
        foreach my $param (qw{match pagespec}) {
                if (! exists $params{$param}) {
        
        foreach my $param (qw{match pagespec}) {
                if (! exists $params{$param}) {

-                       return "[[testpagespec missing $param parameter]]";
+                       return "[[testpagespec $param parameter is required]]";

                }
        }
 
                }
        }
 


@@ -25,9 +25,6 @@ sub preprocess (@) { #{{{
        if ($ret) {
                return "match: $ret";
        }
        if ($ret) {
                return "match: $ret";
        }

-       elsif (! defined $ret) {
-               return "match failed: $@";
-       }

        else {
                return "no match: $ret";
        }
        else {
                return "no match: $ret";
        }