From: Amitai Schlair <schmonz-web-ikiwiki@schmonz.com>
Date: Sun, 12 May 2013 23:16:50 +0000 (-0400)
Subject: Merge branch 'master' into fancypodcast
X-Git-Tag: 3.20130904~88^2~9
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d33b31f70638025f19fdfa03a8c2e609faca792a?hp=-c

Merge branch 'master' into fancypodcast
---

d33b31f70638025f19fdfa03a8c2e609faca792a
diff --combined IkiWiki/Plugin/meta.pm
index f5b9bb521,7ea70b5d1..794f6d861
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@@ -107,12 -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 "";
  	}
@@@ -121,17 -121,6 +121,17 @@@
  		add_link($page, $value);
  		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;
 +		# fallthrough
 +	}
  	elsif ($key eq 'author') {
  		$pagestate{$page}{meta}{author}=$value;
  		if (exists $params{sortas}) {
@@@ -329,10 -318,6 +329,10 @@@ sub pagetemplate (@) 
  		$template->param(title_overridden => 1);
  	}
  
 +	if (exists $pagestate{$page}{meta}{enclosure}) {
 +		$template->param(enclosure => HTML::Entities::encode_entities(IkiWiki::urlabs($pagestate{$page}{meta}{enclosure}, $config{url})));
 +	}
 +
  	foreach my $field (qw{authorurl}) {
  		eval q{use HTML::Entities};
  		$template->param($field => HTML::Entities::encode_entities($pagestate{$page}{meta}{$field}))