diff options
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 4 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 3 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/disable_sub-discussion_pages.mdwn | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index ff1342bc1..ecae47f1a 100644 --- 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 30249b9bd..7ca9a3820 100644 --- 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 a607476fc..1347f1949 100644 --- 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 e004e53e1..ede98c8df 100644 --- 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]] |