aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2010-11-12 00:36:03 -0400
committerJoey Hess <joey@kitenet.net>2010-11-12 00:36:03 -0400
commitd8de98911ec98f9e4560ab2939b4edf8fb04066b (patch)
tree6213d2d5cd219f595e9c92a5b793f279fd540526
parent78de33d2eaf8a187b610685f70e60b7d5946374f (diff)
downloadikiwiki-d8de98911ec98f9e4560ab2939b4edf8fb04066b.tar
ikiwiki-d8de98911ec98f9e4560ab2939b4edf8fb04066b.tar.gz
comments: Make comment() pagespec also match comments that are being posted.
-rw-r--r--IkiWiki/Plugin/comments.pm18
-rw-r--r--debian/changelog2
2 files changed, 12 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 57f5b1304..a39dab36c 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -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, @_);
diff --git a/debian/changelog b/debian/changelog
index 91a678805..2c4c9274a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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