* Fix sometimes broken links to Discussion pages from blog pages.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 8c00ca5f5ec10ecd255bbb1771085b24496098e7..fd7a59ab39cecd12857ebb55de80467d74eb6439 100644 (file)
--- 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 37e37111dd97fc1238bdeee29031a703efe47273..e37def28c06800ba3cad1fd651bb0b13db464d19 100644 (file)
--- 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