X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ff67a31db53dee296ef5f603cc6062d2191c7178..fa354167bb9addab130e6a89eb845d5bc798c35e:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3cafcbe9c..de193bd12 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -859,7 +859,7 @@ sub num_comments ($$) {
 	my $dir=shift;
 
 	my @comments=glob("$dir/$page/$config{comments_pagename}*._comment");
-	return @comments;
+	return int @comments;
 }
 
 sub unique_comment_location ($$$$) {
@@ -908,10 +908,12 @@ sub match_comment ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 
-	if (! IkiWiki::isinternal($page)) {
-		return IkiWiki::FailReason->new("$page is not a comment");
-	}
-	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	# To see if it's a comment, check the source file type.
+	# Deal with comments that were just deleted.
+	my $source=exists $IkiWiki::pagesources{$page} ?
+		$IkiWiki::pagesources{$page} :
+		$IkiWiki::delpagesources{$page};
+	my $type=IkiWiki::pagetype($source);
 	if (defined $type && $type ne "_comment") {
 		return IkiWiki::FailReason->new("$page is not a comment");
 	}
@@ -923,10 +925,10 @@ sub match_comment_pending ($$;@) {
 	my $page = shift;
 	my $glob = shift;
 	
-	if (! IkiWiki::isinternal($page)) {
-		return IkiWiki::FailReason->new("$page is not a pending comment");
-	}
-	my $type=IkiWiki::pagetype($IkiWiki::pagesources{$page});
+	my $source=exists $IkiWiki::pagesources{$page} ?
+		$IkiWiki::pagesources{$page} :
+		$IkiWiki::delpagesources{$page};
+	my $type=IkiWiki::pagetype($source);
 	if (defined $type && $type ne "_comment_pending") {
 		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}