From d70b05971f6491df83940834ca169c86e426af97 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Sat, 10 Jan 2009 11:29:56 +0000
Subject: [PATCH 1/2] comments: only try to insert commentuser etc. into
templates if the page contained [[!_comment]]
---
IkiWiki/Plugin/comments.pm | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 3a0465dbb..89410bb70 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -604,6 +604,12 @@ sub pagetemplate (@) {
}
}
+ # everything below this point is only relevant to the comments
+ # themselves
+ if (!exists $commentstate{$page}) {
+ return;
+ }
+
if ($template->query(name => 'commentuser')) {
$template->param(commentuser =>
$commentstate{$page}{commentuser});
From 79676ca44561a412a2d4d1b98f28c14b55048125 Mon Sep 17 00:00:00 2001
From: Simon McVittie
Date: Sat, 10 Jan 2009 11:31:24 +0000
Subject: [PATCH 2/2] comments: if the remove plugin is enabled, append a
"Remove comment" link
---
IkiWiki/Plugin/comments.pm | 8 ++++++++
templates/comment.tmpl | 11 +++++++++++
2 files changed, 19 insertions(+)
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 89410bb70..1c4ab4895 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -634,6 +634,14 @@ sub pagetemplate (@) {
$template->param(commentauthorurl =>
$commentstate{$page}{commentauthorurl});
}
+
+ if ($template->query(name => 'removeurl') &&
+ IkiWiki::Plugin::remove->can("check_canremove") &&
+ length $config{cgiurl}) {
+ $template->param(removeurl => IkiWiki::cgiurl(do => 'remove',
+ page => $page));
+ $template->param(have_actions => 1);
+ }
}
package IkiWiki::PageSpec;
diff --git a/templates/comment.tmpl b/templates/comment.tmpl
index 6f2b1619e..582efccb8 100644
--- a/templates/comment.tmpl
+++ b/templates/comment.tmpl
@@ -39,4 +39,15 @@ Comment by
—
+
+
+
+
+