aboutsummaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-30 23:51:48 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-30 23:51:48 +0000
commit908e004b4c5a1970246afd055a34dea4ea146b3e (patch)
tree83546f2f85b11c750a4ee2367b9259e65470f509 /IkiWiki
parentecd74fbe5d3ace51a57b0f6f756538aba8123727 (diff)
downloadikiwiki-908e004b4c5a1970246afd055a34dea4ea146b3e.tar
ikiwiki-908e004b4c5a1970246afd055a34dea4ea146b3e.tar.gz
* Title metadata of inlined pages now shows up in blogs, although not yet
in their rss feeds.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/inline.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 7bb71a436..b06470bfe 100644
--- 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,
);