Merge commit 'upstream/master' into pub/po

[ikiwiki.git] / IkiWiki / Render.pm

diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm
index 8e4c8af71f8a2df4c0f59f0971309f76b040cd69..f4de19378e86223bf7c2d518a5c618f7a47d120d 100644 (file)
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@ -7,8 +7,8 @@ use strict;
 use IkiWiki;
 use Encode;
 
-our %backlinks=();
-our $backlinks_calculated=0;
+my %backlinks;
+my $backlinks_calculated=0;
 
 sub calculate_backlinks () {
        return if $backlinks_calculated;
@@ -76,7 +76,7 @@ sub genpage ($$) {
                $actions++;
        }
        if ($config{discussion}) {
-               my $discussionlink=gettext("discussion");
+               my $discussionlink=lc(gettext("Discussion"));
                if ($page !~ /.*\/\Q$discussionlink\E$/ &&
                   (length $config{cgiurl} ||
                    exists $links{$page."/".$discussionlink})) {
@@ -146,7 +146,7 @@ sub scan ($) {
                if ($config{discussion}) {
                        # Discussion links are a special case since they're
                        # not in the text of the page, but on its template.
-                       $links{$page}=[ $page."/".gettext("discussion") ];
+                       $links{$page}=[ $page."/".lc(gettext("Discussion")) ];
                }
                else {
                        $links{$page}=[];