Catch up rsspage to atompage. Validates.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 9b4cee4e42ab7c37c21cd69a3837f3a66b59ba74..e313eb7755313ea051b14f43310168fb5750dd0e 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -710,6 +710,7 @@ sub genfeed ($$$$$@) {
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),
                feeddesc => $feeddesc,
                guid => $guid,
                feeddate => date_3339($lasttime),

+               feeddate_822 => date_822($lasttime),

                feedurl => $feedurl,
        );
        run_hooks(pagetemplate => sub {
                feedurl => $feedurl,
        );
        run_hooks(pagetemplate => sub {

diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl
index e54094aaa2f1ddbc7e7b1cde73827eca9ad7da89..fec6775c242fc83adb3e6d02ccacb43c7f47b86e 100644 (file)
--- a/templates/rsspage.tmpl
+++ b/templates/rsspage.tmpl
@@ -1,11 +1,18 @@
 <?xml version="1.0"?>
 <rss version="2.0"
 <?xml version="1.0"?>
 <rss version="2.0"

+     xmlns:atom="http://www.w3.org/2005/Atom"

      xmlns:dc="http://purl.org/dc/elements/1.1/"
      xmlns:dcterms="http://purl.org/dc/terms/" >
 <channel>
 <title><TMPL_VAR TITLE></title>
 <link><TMPL_VAR PAGEURL></link>
      xmlns:dc="http://purl.org/dc/elements/1.1/"
      xmlns:dcterms="http://purl.org/dc/terms/" >
 <channel>
 <title><TMPL_VAR TITLE></title>
 <link><TMPL_VAR PAGEURL></link>

+<atom:link href="<TMPL_VAR FEEDURL>" rel="self" type="application/rss+xml" />
+<TMPL_IF COPYRIGHT>
+<copyright><TMPL_VAR COPYRIGHT ESCAPE=HTML></copyright>
+</TMPL_IF>

 <description><TMPL_VAR FEEDDESC ESCAPE=HTML></description>
 <description><TMPL_VAR FEEDDESC ESCAPE=HTML></description>

+<generator>ikiwiki</generator>
+<pubDate><TMPL_VAR FEEDDATE_822></pubDate>

 <TMPL_VAR CONTENT>
 </channel>
 </rss>
 <TMPL_VAR CONTENT>
 </channel>
 </rss>