Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index c77837e3cbd5c92016977fe7b273286a21abd71a..f5b9bb5219f769563415cd90463bba9a6979f188 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -128,8 +128,9 @@ sub preprocess (@) {
                }
                add_depends($page, $link, deptype("presence"));
 
                }
                add_depends($page, $link, deptype("presence"));
 

-               $value=urlto($link, $page);
+               $value=urlto($link, $page, 1);

                $pagestate{$page}{meta}{enclosure}=$value;
                $pagestate{$page}{meta}{enclosure}=$value;

+               # fallthrough

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


@@ -329,7 +330,7 @@ sub pagetemplate (@) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {
        }
 
        if (exists $pagestate{$page}{meta}{enclosure}) {

-               $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}) {