move meat of type checking to match_page where it belongs

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index d20a3709c9a9a4c911e0a0dfce6025e7de0e8f97..43995fc9665a3768b88ec7919862e49972bcf1ca 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -1401,10 +1401,6 @@ sub filter ($$$) {
        return $content;
 }
 
-sub indexlink () {
-       return "<a href=\"$config{url}\">$config{wikiname}</a>";
-}
-
 sub check_canedit ($$$;$) {
        my $page=shift;
        my $q=shift;
@@ -1744,24 +1740,20 @@ sub misctemplate ($$;@) {
        my $title=shift;
        my $content=shift;
        
-       my $template=template("misc.tmpl") || template("page.tmpl");
+       my $template=template("page.tmpl");
 
        run_hooks(pagetemplate => sub {
                shift->(page => "", destpage => "", template => $template);
        });
 
        $template->param(
+               dynamic => 1,
+               have_actions => 0, # force off
                title => $title,
                wikiname => $config{wikiname},
                content => $content,
                baseurl => baseurl(),
                html5 => $config{html5},
-               have_actions => 0, # force off
-               searchform => 0,   # ditto
-               parentlinks => [{  # override
-                       url => $config{url},
-                       page => $config{wikiname},
-               }],
                @_,
        );
 
@@ -2337,11 +2329,7 @@ sub match_glob ($$;@) {
 
        my $regexp=IkiWiki::glob2re($glob);
        if ($page=~/^$regexp$/i) {
-               if ($params{onlypage} &&
-                   ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
-                       return IkiWiki::FailReason->new("$page is not a page");
-               }
-               elsif (! IkiWiki::isinternal($page) || $params{internal}) {
+               if (! IkiWiki::isinternal($page) || $params{internal}) {
                        return IkiWiki::SuccessReason->new("$glob matches $page");
                }
                else {
@@ -2358,7 +2346,14 @@ sub match_internal ($$;@) {
 }
 
 sub match_page ($$;@) {
-       return match_glob($_[0], $_[1], @_, onlypage => 1)
+       my $page=shift;
+       my $match=match_glob($page, $_[1], @_);
+       if ($match && ! defined IkiWiki::pagetype($IkiWiki::pagesources{$page})) {
+               return IkiWiki::FailReason->new("$page is not a page");
+       }
+       else {
+               return $match;
+       }
 }
 
 sub match_link ($$;@) {