fix comment matching pagespecs

test isinternal first, because match_glob with internal => 1 also returns
non-internal pages that match. This order should also be faster.

Remove test to see if pagesources is set. isinternal will not succeed if it
is not.

1 files changed, 17 insertions, 15 deletions

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 5d7176a8c..348d91fd8 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -904,28 +904,30 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match && exists $IkiWiki::pagesources{$page}) {
-		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if (defined $type && $type ne "_comment") {
-			return IkiWiki::FailReason->new("$page is not a comment");
-		}
+	if (! IkiWiki::isinternal($page)) {
+		return IkiWiki::FailReason->new("$page is not a comment");
+	}
+	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	if (defined $type && $type ne "_comment") {
+		return IkiWiki::FailReason->new("$page is not a comment");
 	}
-	return $match;
+
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 sub match_comment_pending ($$;@) {
 	my $page = shift;
 	my $glob = shift;
-
-	my $match=match_glob($page, "$glob/*", internal => 1, @_);
-	if ($match && $IkiWiki::pagesources{$page}) {
-		my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
-		if (defined $type && $type ne "_comment_pending") {
-			return IkiWiki::FailReason->new("$page is not a pending comment");
-		}
+	
+	if (! IkiWiki::isinternal($page)) {
+		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
-	return $match;
+	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	if (defined $type && $type ne "_comment_pending") {
+		return IkiWiki::FailReason->new("$page is not a pending comment");
+	}
+
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 1