Merge branch 'master' into fancypodcast

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index 70233decf5c2cc4ac87971a122c8859f9a83465f..f5b9bb5219f769563415cd90463bba9a6979f188 100644 (file)
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -128,7 +128,7 @@ sub preprocess (@) {
                }
                add_depends($page, $link, deptype("presence"));
 
-               $value=urlto($link, $page);
+               $value=urlto($link, $page, 1);
                $pagestate{$page}{meta}{enclosure}=$value;
                # fallthrough
        }
@@ -330,7 +330,7 @@ sub pagetemplate (@) {
        }
 
        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}) {