From: Joey Hess <joey@kitenet.net>
Date: Thu, 6 May 2010 23:04:56 +0000 (-0400)
Subject: move meat of type checking to match_page where it belongs
X-Git-Tag: 3.20100515~77
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/71b8d2ad4122b7cfe9eda52959e0b2c1f172439c

move meat of type checking to match_page where it belongs
---

diff --git a/IkiWiki.pm b/IkiWiki.pm
index ee1ecb58f..43995fc96 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -2329,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 {
@@ -2350,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 ($$;@) {