diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-18 15:06:57 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2007-01-18 15:06:57 +0000 |
| commit | f6e917fcce86638e2a06c48c0df714c3dd93c8b0 (patch) | |
| tree | 9b81ea34ee1a3d0f7072ebc71506891bf6a51969 /IkiWiki | |
| parent | d8c3baf7a3c152f44bcb0e68ed13776a38c8f3a0 (diff) | |
| download | ikiwiki-f6e917fcce86638e2a06c48c0df714c3dd93c8b0.tar ikiwiki-f6e917fcce86638e2a06c48c0df714c3dd93c8b0.tar.gz | |
* Fix handling of discussion links on discussion pages when l10n is used.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/inline.pm | 13 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 12 |
2 files changed, 16 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm index 13ff0aa19..4bdb14032 100644 --- a/IkiWiki/Plugin/inline.pm +++ b/IkiWiki/Plugin/inline.pm @@ -156,11 +156,14 @@ sub preprocess_inline (@) { #{{{ if ($actions) { my $file = $pagesources{$page}; my $type = pagetype($file); - 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)); + if ($config{discussion}) { + my $discussionlink=gettext("discussion"); + if ($page !~ /.*\/\Q$discussionlink\E$/ && + (length $config{cgiurl} || + exists $links{$page."/".$discussionlink})) { + $template->param(have_actions => 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/IkiWiki/Render.pm b/IkiWiki/Render.pm index 7ca9a3820..dcd107b81 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -93,10 +93,14 @@ sub genpage ($$$) { #{{{ $template->param(historyurl => $u); $actions++; } - if ($config{discussion} && $page !~ /.*\/discussion$/ && - (length $config{cgiurl} || exists $links{$page."/".gettext("discussion")})) { - $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1)); - $actions++; + if ($config{discussion}) { + my $discussionlink=gettext("discussion"); + if ($page !~ /.*\/\Q$discussionlink\E$/ && + (length $config{cgiurl} || + exists $links{$page."/".$discussionlink})) { + $template->param(discussionlink => htmllink($page, $page, gettext("Discussion"), 1, 1)); + $actions++; + } } if ($actions) { |