aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--IkiWiki/Plugin/inline.pm2
-rw-r--r--debian/changelog3
2 files changed, 3 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8c00ca5f5..fd7a59ab3 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -135,7 +135,7 @@ sub preprocess_inline (@) { #{{{
my $type = pagetype($file);
if ($config{discussion}) {
$template->param(have_actions => 1);
- $template->param(discussionlink => htmllink($page, $page, "Discussion", 1, 1));
+ $template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
}
if (length $config{cgiurl} && defined $type) {
$template->param(have_actions => 1);
diff --git a/debian/changelog b/debian/changelog
index 37e37111d..e37def28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ ikiwiki (1.36) UNRELEASED; urgency=low
* Fix various links on the hyperestradier pages.
* Use POST for poll to avoid some robots.
+ * Fix sometimes broken links to Discussion pages from blog pages.
- -- Joey Hess <joeyh@debian.org> Thu, 14 Dec 2006 14:04:25 -0500
+ -- Joey Hess <joeyh@debian.org> Thu, 14 Dec 2006 14:41:01 -0500
ikiwiki (1.35) unstable; urgency=low