X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a629b276b27bb900ec9e544820cd42aa140e8bdc..578d59567a0f84fe62016fbbd4caf98509e14049:/IkiWiki/Plugin/inline.pm

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 20cb8a27c..455ac3ad5 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -647,6 +647,7 @@ sub genfeed ($$$$$@) {
 	foreach my $p (@pages) {
 		my $u=URI->new(encode_utf8(urlto($p, "", 1)));
 		my $pcontent = absolute_urls(get_inline_content($p, $page), $url);
+		my $fancy_enclosure_seen = 0;
 
 		$itemtemplate->param(
 			title => pagetitle(basename($p)),
@@ -668,17 +669,23 @@ sub genfeed ($$$$$@) {
 				$itemtemplate->param(mdate_822 => date_822($pagestate{$p}{meta}{updated}));
 				$itemtemplate->param(mdate_3339 => date_3339($pagestate{$p}{meta}{updated}));
 			}
+
+			if (exists $pagestate{$p}{meta}{enclosure}) {
+				my $absurl = $pagestate{$p}{meta}{enclosure};
+				my $file = $pagestate{$p}{meta}{enclosurefile};
+				genenclosure($itemtemplate, $absurl, $file);
+				$fancy_enclosure_seen = 1;
+			}
 		}
 
 		my $file=$pagesources{$p};
-		my $type=pagetype($file);
-		if (defined $type) {
-			$itemtemplate->param(content => $pcontent);
-		}
-		else {
+		unless ($fancy_enclosure_seen || defined(pagetype($file))) {
 			genenclosure($itemtemplate, $u, $file);
+			$itemtemplate->param(simplepodcast => 1);
 		}
 
+		$itemtemplate->param(content => $pcontent);
+
 		run_hooks(pagetemplate => sub {
 			shift->(page => $p, destpage => $page,
 				template => $itemtemplate);
@@ -699,6 +706,7 @@ sub genfeed ($$$$$@) {
 		feeddesc => $feeddesc,
 		guid => $guid,
 		feeddate => date_3339($lasttime),
+		feeddate_822 => date_822($lasttime),
 		feedurl => $feedurl,
 	);
 	run_hooks(pagetemplate => sub {