Merge branch 'master' into po

[git.ikiwiki.info.git] / templates / rssitem.tmpl

diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index 0fab42e710ba3689668fbc4f49e2fcbe192195c0..a61b92b6127505e3f61b068d046e3f706a956d9a 100644 (file)
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,21 +1,29 @@
 <item>
        <TMPL_IF NAME="AUTHOR">
-       <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE ESCAPE=HTML></title>
-       <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+       <title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
+       <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
        <TMPL_ELSE>
-       <title><TMPL_VAR TITLE ESCAPE=HTML></title>
+       <title><TMPL_VAR TITLE></title>
+       </TMPL_IF>
+       <TMPL_IF NAME="GUID">
+         <guid isPermaLink="no"><TMPL_VAR GUID></guid>
+       <TMPL_ELSE>
+         <guid><TMPL_VAR URL></guid>
        </TMPL_IF>
-       <guid><TMPL_VAR URL></guid>
        <link><TMPL_VAR PERMALINK></link>
        <TMPL_IF NAME="CATEGORIES">
        <TMPL_LOOP NAME="CATEGORIES">
        <category><TMPL_VAR CATEGORY></category>
        </TMPL_LOOP>
        </TMPL_IF>
-       <pubDate><TMPL_VAR DATE_822></pubDate>
+       <pubDate><TMPL_VAR CDATE_822></pubDate>
+       <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
        <TMPL_IF NAME="ENCLOSURE">
        <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
        <TMPL_ELSE>
-       <description><![CDATA[<TMPL_VAR CONTENT>]]></description>
+       <description><TMPL_VAR CONTENT ESCAPE=HTML></description>
+       </TMPL_IF>
+       <TMPL_IF NAME="COMMENTSURL">
+       <comments><TMPL_VAR NAME="COMMENTSURL"></comments>
        </TMPL_IF>
 </item>