]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/inline.pm
* Fix for missing backlinks() in pagestats plugin.
[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm
index eb21959f90120ff2b463eedd8ae3da1416858f8c..ec1cf0970dcdc21f12beba82e27c9bc8ed8aa288 100644 (file)
@@ -5,7 +5,6 @@ package IkiWiki::Plugin::inline;
 use warnings;
 use strict;
 use IkiWiki 1.00;
-use IkiWiki::Render; # for displaytime
 use URI;
 
 sub import { #{{{
@@ -158,8 +157,13 @@ sub preprocess_inline (@) { #{{{
                                my $file = $pagesources{$page};
                                my $type = pagetype($file);
                                if ($config{discussion}) {
-                                       $template->param(have_actions => 1);
-                                       $template->param(discussionlink => htmllink($page, $params{page}, "Discussion", 1, 1));
+                                       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}, gettext("Discussion"), 1, 1));
+                                       }
                                }
                                if (length $config{cgiurl} && defined $type) {
                                        $template->param(have_actions => 1);
@@ -236,7 +240,7 @@ sub date_822 ($) { #{{{
 
        eval q{use POSIX};
        error($@) if $@;
-       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
        my $ret=POSIX::strftime("%a, %d %b %Y %H:%M:%S %z", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);
@@ -248,7 +252,7 @@ sub date_3339 ($) { #{{{
 
        eval q{use POSIX};
        error($@) if $@;
-       my $lc_time= POSIX::setlocale(&POSIX::LC_TIME);
+       my $lc_time=POSIX::setlocale(&POSIX::LC_TIME);
        POSIX::setlocale(&POSIX::LC_TIME, "C");
        my $ret=POSIX::strftime("%Y-%m-%dT%H:%M:%SZ", localtime($time));
        POSIX::setlocale(&POSIX::LC_TIME, $lc_time);