Merge branch 'master' into commentreorg

[ikiwiki.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 43995fc9665a3768b88ec7919862e49972bcf1ca..d76b5edb403b931e207ccd6dd4ac2f8f5da4fe95 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2342,13 +2342,14 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
-       return match_glob($_[0], $_[1], @_, internal => 1)
+       return match_glob(shift, shift, @_, internal => 1)
 }
 
 sub match_page ($$;@) {
        my $page=shift;
-       my $match=match_glob($page, $_[1], @_);
-       if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+       my $match=match_glob($page, shift, @_);
+       if ($match && ! (exists $IkiWiki::pagesources{$page}
+           && defined IkiWiki::pagetype($IkiWiki::pagesources{$page}))) {
                return IkiWiki::FailReason->new("$page is not a page");
        }
        else {