* Title metadata of inlined pages now shows up in blogs, although not yet

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

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 7bb71a436783fe3ca57515fab67e42e39170622a..b06470bfef299dd0accf075ef6103e05893b4b21 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -83,7 +83,12 @@ sub preprocess_inline (@) { #{{{
        );
        
        foreach my $page (@list) {
-               $template->param(pagelink => htmllink($params{page}, $params{page}, $page));
+               # Don't use htmllink because this way the title is separate
+               # and can be overridden by other plugins.
+               my $link=htmlpage(bestlink($params{page}, $page));
+               $link=abs2rel($link, dirname($params{page}));
+               $template->param(pageurl => $link);
+               $template->param(title => $page);
                $template->param(content => get_inline_content($page, $params{page}))
                        if $params{archive} eq "no";
                $template->param(ctime => displaytime($pagectime{$page}));
@@ -172,6 +177,7 @@ sub genrss ($@) { #{{{
 
        $template->param(
                title => $config{wikiname},
+               wikiname => $config{wikiname},
                pageurl => $url,
                items => \@items,
        );