Merge branch 'comments'

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d93ff7374069684a97e35c5626ec853e02d4ce47..47116089bdac0f66b15bb02fbcd8f3410e42d41b 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -100,7 +100,7 @@ sub getsetup () {
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",
                type => "string",
                default => '',
                example => "/var/www/wiki/ikiwiki.cgi",

-               description => "cgi wrapper to generate",
+               description => "filename of cgi wrapper to generate",

                safe => 0, # file
                rebuild => 0,
        },
                safe => 0, # file
                rebuild => 0,
        },


@@ -1797,7 +1797,8 @@ sub pagespec_match ($$;@) {
        }
 
        my $sub=pagespec_translate($spec);
        }
 
        my $sub=pagespec_translate($spec);

-       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"") if $@;
+       return IkiWiki::FailReason->new("syntax error in pagespec \"$spec\"")
+               if $@ || ! defined $sub;

        return $sub->($page, @params);
 }
 
        return $sub->($page, @params);
 }