comments: Make comment() pagespec also match comments that are being posted.

master
Joey Hess 2010-11-12 00:36:03 -04:00
parent 78de33d2ea
commit d8de98911e
2 changed files with 12 additions and 8 deletions

View File

@ -947,14 +947,16 @@ sub match_comment ($$;@) {
my $page = shift;
my $glob = shift;
# 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=defined $source ? IkiWiki::pagetype($source) : undef;
if (! defined $type || $type ne "_comment") {
return IkiWiki::FailReason->new("$page is not a comment");
if (! $postcomment) {
# 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=defined $source ? IkiWiki::pagetype($source) : undef;
if (! defined $type || $type ne "_comment") {
return IkiWiki::FailReason->new("$page is not a comment");
}
}
return match_glob($page, "$glob/*", internal => 1, @_);

2
debian/changelog vendored
View File

@ -13,6 +13,8 @@ ikiwiki (3.20101024) UNRELEASED; urgency=low
comments, but leave your blog posts unscrubbed, etc.
* comments: Make postcomment() pagespec work when previewing a comment,
including during moderation.
* comments: Make comment() pagespec also match comments that are being
posted.
-- Joey Hess <joeyh@debian.org> Mon, 25 Oct 2010 22:30:29 -0400