* Don't put discussion links on discussion pages.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index ff1342bc1cdf99325166c37a6c3872e02f6404a2..ecae47f1afb63f1ad3d41b2556bd7cf2adae355b 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -157,7 +157,9 @@ sub preprocess_inline (@) { #{{{
                        if ($actions) {
                                my $file = $pagesources{$page};
                                my $type = pagetype($file);
-                               if ($config{discussion} && (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
+                               if ($config{discussion} &&
+                                   $page !~ /.*\/discussion$/ &&
+                                   (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
                                        $template->param(have_actions => 1);
                                        $template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
                                }

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 30249b9bd1e6dfef00af3bfc1a4e0815bbbf9ac0..7ca9a38208aef4d141f629943ce32d10f388ee20 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -93,7 +93,8 @@ sub genpage ($$$) { #{{{
                $template->param(historyurl => $u);
                $actions++;
        }
-       if ($config{discussion} && (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
+       if ($config{discussion} && $page !~ /.*\/discussion$/ &&
+           (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) {
                $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
                $actions++;
        }

diff --git a/debian/changelog b/debian/changelog
index a607476fc2d63203485cb78633761c1177823e72..1347f194905229fa66c4d099c7f935e8713b5516 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,8 +17,9 @@ ikiwiki (1.37) UNRELEASED; urgency=low
   * Initial work on internationalization of the program code. po/ikiwiki.pot
     is available for translation.
   * Export gettext() from IkiWiki module.
+  * Don't put discussion links on discussion pages.
 
- -- Joey Hess <joeyh@debian.org>  Thu, 28 Dec 2006 17:13:43 -0500
+ -- Joey Hess <joeyh@debian.org>  Thu, 28 Dec 2006 23:40:57 -0500
 
 ikiwiki (1.36) unstable; urgency=low
 

diff --git a/doc/bugs/disable_sub-discussion_pages.mdwn b/doc/bugs/disable_sub-discussion_pages.mdwn
index e004e53e1755d0dce990021e790402b0d913a279..ede98c8df9e3fc49f2d1ce53276d444f0d6909e0 100644 (file)
--- a/doc/bugs/disable_sub-discussion_pages.mdwn
+++ b/doc/bugs/disable_sub-discussion_pages.mdwn
@@ -4,4 +4,4 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
 -- [[JeremyReed]]
 
 > Discussion pages should clearly be a special case that don't get Discussion
-> links put at the top. --[[Joey]]
+> links put at the top... aaand.. [[done]]! --[[Joey]]