Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index cb0768b91799ad4e642b8f1f67dee73f691748b5..e7b96bdf142f47e221e321b4ecb8ce68ab4989f8 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -107,12 +107,12 @@ sub preprocess (@) {
                # fallthrough
        }
        elsif ($key eq 'license') {
                # 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') {
                $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 "";
        }
                $pagestate{$page}{meta}{copyright}=$value;
                return "";
        }


@@ -122,7 +122,16 @@ sub preprocess (@) {
                return "";
        }
        elsif ($key eq 'enclosure') {
                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}{enclosure}=$value;

+               $pagestate{$page}{meta}{enclosurefile}=$link;
+               # fallthrough

        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;
        }
        elsif ($key eq 'author') {
                $pagestate{$page}{meta}{author}=$value;


@@ -322,8 +331,7 @@ sub pagetemplate (@) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {

-               # XXX what if the enclosure doesn't exist?
-               $template->param(enclosure => $pagestate{$page}{meta}{enclosure});
+               $template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));

        }
 
        foreach my $field (qw{authorurl}) {
        }
 
        foreach my $field (qw{authorurl}) {