X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b34d31142b9fed28ec9cf77fe0c5d9f405d48c84..7e7dea078bce3437b9a14d96079ddd68a5f0aab9:/IkiWiki/Plugin/comments.pm

diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8f475aa56..8d46ed579 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -755,10 +755,8 @@ sub previewcomment ($$$) {
 sub commentsshown ($) {
 	my $page=shift;
 
-	return ! pagespec_match($page, "comment(*)",
-	                        location => $page) &&
-	       pagespec_match($page, $config{comments_pagespec},
-	                      location => $page);
+	return pagespec_match($page, $config{comments_pagespec},
+		location => $page);
 }
 
 sub commentsopen ($) {
@@ -785,7 +783,7 @@ sub pagetemplate (@) {
 		my $comments = undef;
 		if ($shown) {
 			$comments = IkiWiki::preprocess_inline(
-				pages => "comment($page)",
+				pages => "comment($page) and !comment($page/*)",
 				template => 'comment',
 				show => 0,
 				reverse => 'yes',
@@ -957,8 +955,7 @@ sub match_comment ($$;@) {
 		}
 	}
 
-	return match_glob($page, "$glob/*", internal => 1, @_) &&
-		! match_glob($page, "$glob/*/*", internal => 1, @_);
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 sub match_comment_pending ($$;@) {
@@ -973,8 +970,7 @@ sub match_comment_pending ($$;@) {
 		return IkiWiki::FailReason->new("$page is not a pending comment");
 	}
 
-	return match_glob($page, "$glob/*", internal => 1, @_) &&
-		! match_glob($page, "$glob/*/*", internal => 1, @_);
+	return match_glob($page, "$glob/*", internal => 1, @_);
 }
 
 1