]> git.vanrenterghem.biz Git - git.ikiwiki.info.git/blobdiff - IkiWiki/Plugin/meta.pm
yes, not committing the setup file to the same VCS is a security thing
[git.ikiwiki.info.git] / IkiWiki / Plugin / meta.pm
index 70233decf5c2cc4ac87971a122c8859f9a83465f..ea099f955ac1c486cdd2baf6636e330a8eae569c 100644 (file)
@@ -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 "";
        }
@@ -128,8 +128,9 @@ sub preprocess (@) {
                }
                add_depends($page, $link, deptype("presence"));
 
-               $value=urlto($link, $page);
+               $value=urlto($link, $page, 1);
                $pagestate{$page}{meta}{enclosure}=$value;
+               $pagestate{$page}{meta}{enclosurefile}=$link;
                # fallthrough
        }
        elsif ($key eq 'author') {
@@ -293,6 +294,7 @@ sub preprocess (@) {
        elsif ($key eq 'name') {
                push @{$metaheaders{$page}}, scrub('<meta name="'.
                        encode_entities($value).
+                       '" '.
                        join(' ', map { "$_=\"$params{$_}\"" } keys %params).
                        ' />', $page, $destpage);
        }
@@ -330,7 +332,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}) {