X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5971a731e98b9b6543d78572c181ffc1bb7e1dd1..8d3c89f0c75c31c5e17a661150662e3efd3a146e:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 54271becc..d76b5edb4 100644
--- 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,23 +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
-		parentlinks => [{  # override
-			url => $config{url},
-			page => $config{wikiname},
-		}],
 		@_,
 	);
 
@@ -2336,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 {
@@ -2353,11 +2342,19 @@ sub match_glob ($$;@) {
 }
 
 sub match_internal ($$;@) {
-	return match_glob($_[0], $_[1], @_, internal => 1)
+	return match_glob(shift, shift, @_, internal => 1)
 }
 
 sub match_page ($$;@) {
-	return match_glob($_[0], $_[1], @_, onlypage => 1)
+	my $page=shift;
+	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 {
+		return $match;
+	}
 }
 
 sub match_link ($$;@) {