Merge remote-tracking branch 'refs/remotes/dgit/dgit/sid'

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

diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index f5b9bb5219f769563415cd90463bba9a6979f188..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 "";
        }


@@ -130,6 +130,7 @@ sub preprocess (@) {
 
                $value=urlto($link, $page, 1);
                $pagestate{$page}{meta}{enclosure}=$value;
 
                $value=urlto($link, $page, 1);
                $pagestate{$page}{meta}{enclosure}=$value;

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

                # fallthrough
        }
        elsif ($key eq 'author') {
                # fallthrough
        }
        elsif ($key eq 'author') {