* Add --timeformat config option to allow changing how dates are displayed.

[git.ikiwiki.info.git] / IkiWiki / Plugin / inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 61b4a8523f2dfaf9156238b0ab54adedc9f77b42..6ecdf0d38989bc34e503607ed493520a83373dc5 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -59,10 +59,10 @@ sub preprocess_inline (@) { #{{{
        foreach my $page (blog_list($params{pages}, $params{show})) {
                next if $page eq $params{page};
                push @pages, $page;
-               $template->param(pagelink => htmllink($params{page}, $page));
+               $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
                $template->param(content => get_inline_content($params{page}, $page))
                        if $params{archive} eq "no";
-               $template->param(ctime => scalar(gmtime($pagectime{$page})));
+               $template->param(ctime => displaytime($pagectime{$page}));
                $ret.=$template->output;
        }
        
@@ -100,7 +100,7 @@ sub get_inline_content ($$) { #{{{
        my $file=$pagesources{$page};
        my $type=pagetype($file);
        if ($type ne 'unknown') {
-               return htmlize($type, linkify(readfile(srcfile($file)), $parentpage));
+               return htmlize($type, linkify($page, $parentpage, readfile(srcfile($file))));
        }
        else {
                return "";