diff options
author | Jonas Smedegaard <dr@jones.dk> | 2013-10-13 00:45:16 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2013-10-13 00:45:16 +0200 |
commit | b2f0227b983d45c448988e4a400f60a4e8a7335b (patch) | |
tree | ea9ca2a574d1b272b57c339348f4876beef24aef /IkiWiki/Plugin/meta.pm | |
parent | 99ffd6f0cf39fb895c01f8e7488b8911f57a052b (diff) |
Sync with ikiwiki 3.20130904.1.
Diffstat (limited to 'IkiWiki/Plugin/meta.pm')
-rw-r--r-- | IkiWiki/Plugin/meta.pm | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm index 421f1dc..e7b96bd 100644 --- a/IkiWiki/Plugin/meta.pm +++ b/IkiWiki/Plugin/meta.pm @@ -107,12 +107,12 @@ sub preprocess (@) { # fallthrough } elsif ($key eq 'license') { - push @{$metaheaders{$page}}, '<link rel="license" href="#page_license" />'; + push @{$metaheaders{$page}}, '<link rel="license" href="#pagelicense" />'; $pagestate{$page}{meta}{license}=$value; return ""; } elsif ($key eq 'copyright') { - push @{$metaheaders{$page}}, '<link rel="copyright" href="#page_copyright" />'; + push @{$metaheaders{$page}}, '<link rel="copyright" href="#pagecopyright" />'; $pagestate{$page}{meta}{copyright}=$value; return ""; } @@ -121,6 +121,18 @@ sub preprocess (@) { add_link($page, $value); return ""; } + elsif ($key eq 'enclosure') { + my $link=bestlink($page, $value); + if (! length $link) { + error gettext("enclosure not found") + } + add_depends($page, $link, deptype("presence")); + + $value=urlto($link, $page, 1); + $pagestate{$page}{meta}{enclosure}=$value; + $pagestate{$page}{meta}{enclosurefile}=$link; + # fallthrough + } elsif ($key eq 'author') { $pagestate{$page}{meta}{author}=$value; if (exists $params{sortas}) { @@ -318,6 +330,10 @@ sub pagetemplate (@) { $template->param(title_overridden => 1); } + if (exists $pagestate{$page}{meta}{enclosure}) { + $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url}))); + } + foreach my $field (qw{authorurl}) { eval q{use HTML::Entities}; $template->param($field => HTML::Entities::encode_entities($pagestate{$page}{meta}{$field})) |