Revert "quick fix for http://ikiwiki.info/bugs/unwanted_discussion_links_on_discussion_pages/"
This reverts commit 2ed033a4aa
.
It has been more properly fixed in upstream's master, that will be merged in
immediately.
Signed-off-by: intrigeri <intrigeri@boum.org>
master
parent
091f11be76
commit
17b3d73f6e
|
@ -77,7 +77,7 @@ sub genpage ($$) {
|
||||||
}
|
}
|
||||||
if ($config{discussion}) {
|
if ($config{discussion}) {
|
||||||
my $discussionlink=gettext("discussion");
|
my $discussionlink=gettext("discussion");
|
||||||
if ($page !~ /.*\/\Q$discussionlink\E$/i &&
|
if ($page !~ /.*\/\Q$discussionlink\E$/ &&
|
||||||
(length $config{cgiurl} ||
|
(length $config{cgiurl} ||
|
||||||
exists $links{$page."/".$discussionlink})) {
|
exists $links{$page."/".$discussionlink})) {
|
||||||
$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
|
$template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), noimageinline => 1, forcesubpage => 1));
|
||||||
|
|
Loading…
Reference in New Issue