summaryrefslogtreecommitdiff
path: root/IkiWiki/Plugin
diff options
context:
space:
mode:
authorJoey Hess <joey@kodama.kitenet.net>2008-12-12 15:05:26 -0500
committerJoey Hess <joey@kodama.kitenet.net>2008-12-12 15:05:26 -0500
commit0ced5995d531ed108a2eec8cee7a3586cd757add (patch)
tree8480e6fd3b9e551038aa5d238ef8cb9b5c2ca839 /IkiWiki/Plugin
parente9797ee0863855da93c7a98612c984fecc8d1e23 (diff)
get rid of the [postcomment] hack
I think that using a flag variable is sorta cleaner. (This is untested.)
Diffstat (limited to 'IkiWiki/Plugin')
-rw-r--r--IkiWiki/Plugin/comments.pm10
1 files changed, 8 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8d333f05f..0de7a6743 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -15,6 +15,8 @@ use constant PREVIEW => "Preview";
use constant POST_COMMENT => "Post comment";
use constant CANCEL => "Cancel";
+my $postcomment;
+
sub import { #{{{
hook(type => "checkconfig", id => 'comments', call => \&checkconfig);
hook(type => "getsetup", id => 'comments', call => \&getsetup);
@@ -383,7 +385,11 @@ sub sessioncgi ($$) { #{{{
$page));
}
- IkiWiki::check_canedit($page . "[postcomment]", $cgi, $session);
+ # Set a flag to indicate that we're posting a comment,
+ # so that postcomment() can tell it should match.
+ $postcomment=1;
+ IkiWiki::check_canedit($page, $cgi, $session);
+ $postcomment=0;
my $editcontent = $form->field('editcontent') || '';
$editcontent =~ s/\r\n/\n/g;
@@ -603,7 +609,7 @@ sub match_postcomment ($$;@) {
my $page = shift;
my $glob = shift;
- unless ($page =~ s/\[postcomment\]$//) {
+ if (! $postcomment) {
return IkiWiki::FailReason->new("not posting a comment");
}
return match_glob($page, $glob);