* Don't put discussion links on discussion pages.
parent
ef165d652e
commit
178ab4c51c
|
@ -157,7 +157,9 @@ sub preprocess_inline (@) { #{{{
|
||||||
if ($actions) {
|
if ($actions) {
|
||||||
my $file = $pagesources{$page};
|
my $file = $pagesources{$page};
|
||||||
my $type = pagetype($file);
|
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(have_actions => 1);
|
||||||
$template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
|
$template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
|
||||||
}
|
}
|
||||||
|
|
|
@ -93,7 +93,8 @@ sub genpage ($$$) { #{{{
|
||||||
$template->param(historyurl => $u);
|
$template->param(historyurl => $u);
|
||||||
$actions++;
|
$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));
|
$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1));
|
||||||
$actions++;
|
$actions++;
|
||||||
}
|
}
|
||||||
|
|
|
@ -17,8 +17,9 @@ ikiwiki (1.37) UNRELEASED; urgency=low
|
||||||
* Initial work on internationalization of the program code. po/ikiwiki.pot
|
* Initial work on internationalization of the program code. po/ikiwiki.pot
|
||||||
is available for translation.
|
is available for translation.
|
||||||
* Export gettext() from IkiWiki module.
|
* 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
|
ikiwiki (1.36) unstable; urgency=low
|
||||||
|
|
||||||
|
|
|
@ -4,4 +4,4 @@ I do want discussion subpage, but I don't want to have, for example: discussion/
|
||||||
-- [[JeremyReed]]
|
-- [[JeremyReed]]
|
||||||
|
|
||||||
> Discussion pages should clearly be a special case that don't get Discussion
|
> 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]]
|
||||||
|
|
Loading…
Reference in New Issue